-
unknown authored
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug mysql-test/mysql-test-run.pl: Auto merged sql/log.cc: Auto merged sql/log.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
387e56aa
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug mysql-test/mysql-test-run.pl: Auto merged sql/log.cc: Auto merged sql/log.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged