-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines mysql-test/r/key_cache.result: Auto merged mysql-test/r/lock.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/preload.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/repair.result: Auto merged mysql-test/r/rpl_failed_optimize.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/merge.test: Auto merged storage/myisammrg/myrg_def.h: Auto merged storage/myisammrg/myrg_open.c: Auto merged mysql-test/r/backup.result: Use local. mysql-test/r/sp.result: Use local. sql/sql_error.cc: Use local. sql/sql_error.h: Use local. sql/share/errmsg.txt: Manual merge. sql/sql_table.cc: Manual merge. storage/myisam/ha_myisam.cc: Manual merge. storage/myisammrg/ha_myisammrg.cc: Manual merge. storage/myisammrg/ha_myisammrg.h: Manual merge.
357cee4b