-
unknown authored
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1 mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/rpl_temporary.result: Auto merged sql/sql_repl.cc: Auto merged mysql-test/t/rpl_temporary.test: manual merge
ed09ed86
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1 mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/rpl_temporary.result: Auto merged sql/sql_repl.cc: Auto merged mysql-test/t/rpl_temporary.test: manual merge