-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main VC++Files/sql/mysqld.vcproj: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/warnings-master.opt: Auto merged mysql-test/t/warnings.test: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged
d4922cff