-
unknown authored
into example.com:/work/bug24219/my50 mysql-test/t/alter_table.test: Auto merged sql/sql_table.cc: manual merge mysql-test/r/alter_table.result: manual merge
db42257d
into example.com:/work/bug24219/my50 mysql-test/t/alter_table.test: Auto merged sql/sql_table.cc: manual merge mysql-test/r/alter_table.result: manual merge