-
unknown authored
into mysql.com:/d2/hf/common/my50-common mysql-test/t/mysqladmin.test: Auto merged sql/item_func.cc: Auto merged libmysqld/lib_sql.cc: merging mysql-test/t/distinct.test: merging sql/sql_prepare.cc: SCCS merged
13248688
into mysql.com:/d2/hf/common/my50-common mysql-test/t/mysqladmin.test: Auto merged sql/item_func.cc: Auto merged libmysqld/lib_sql.cc: merging mysql-test/t/distinct.test: merging sql/sql_prepare.cc: SCCS merged