-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/r/create.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/t/func_str.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_table.cc: Auto merged mysql-test/t/create.test: Resolve conflict sql/mysql_priv.h: Resolve conflict sql/table.cc: Resolve conflict sql/unireg.cc: Resolve conflict
7aaa8988