-
unknown authored
into mysql.com:/opt/local/work/mysql-5.0-merge sql/set_var.cc: Auto merged mysql-test/r/ps.result: Manual merge. mysql-test/t/ps.test: Manual merge. sql/item_row.cc: Manual merge. sql/item_row.h: Manual merge. sql/mysql_priv.h: Manual merge. sql/mysqld.cc: Manual merge. sql/set_var.h: Manual merge. sql/sql_class.cc: Manual merge. sql/sql_class.h: Manual merge. sql/sql_prepare.cc: Manual merge.
f65489f8