-
unknown authored
into mysql.com:/usr/home/ram/work/mysql-5.0 sql/ha_blackhole.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged mysql-test/r/variables.result: merging mysql-test/t/variables.test: merging
c00dd12c
into mysql.com:/usr/home/ram/work/mysql-5.0 sql/ha_blackhole.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged mysql-test/r/variables.result: merging mysql-test/t/variables.test: merging