-
unknown authored
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/case.result: Auto merged mysql-test/r/rpl_temporary.result: Auto merged mysql-test/t/case.test: Auto merged mysql-test/t/rpl_temporary.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_strfunc.cc: Auto merged storage/myisam/myisam_ftdump.c: Auto merged sql/sql_base.cc: manual merge use local. Another changeset for 5.1 is following.
2aeb0ae4