-
unknown authored
into mysql.com:/home/bar/mysql-5.1-new-rpl client/mysql.cc: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/mysqld.cc: SCCS merged
6d9d64ba