-
unknown authored
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/range.result: Auto merged mysql-test/t/range.test: Auto merged mysys/default.c: Auto merged scripts/mysqld_multi.sh: Auto merged sql/field.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Merfge backport
48f233c3