mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged mysys/default.c: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged Makefile.am: SCCS merged
This commit is contained in:
commit
7bba59bb25