-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/r/key_cache.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/r/func_math.result: Resolve conflicts mysql-test/r/user_var.result: Resolve conflicts mysql-test/t/func_math.test: Resolve conflicts mysql-test/t/user_var.test: Resolve conflicts sql/item_func.cc: Resolve conflicts sql/sql_parse.cc: Resolve conflicts
c8ecd4bb