• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 91f54bf1
    unknown authored
    into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
    
    
    client/mysqldump.c:
      Auto merged
    mysql-test/r/mysqldump.result:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/table.cc:
      Auto merged
    mysql-test/r/innodb_mysql.result:
      Manual merge.
    mysql-test/t/innodb_mysql.test:
      Manual merge.
    sql/sql_table.cc:
      Manual merge.
    91f54bf1
innodb_mysql.result 28.9 KB