-
unknown authored
into mysql.com:/home/mydev/mysql-5.1-bug8841 mysql-test/r/innodb.result: Auto merged mysql-test/r/myisam.result: Auto merged sql/sql_table.cc: Auto merged
ff6f76b0
into mysql.com:/home/mydev/mysql-5.1-bug8841 mysql-test/r/innodb.result: Auto merged mysql-test/r/myisam.result: Auto merged sql/sql_table.cc: Auto merged