-
unknown authored
into mysql.com:/users/lthalmann/bk/mysql-5.0 myisam/mi_rkey.c: Auto merged mysql-test/r/subselect2.result: Auto merged mysql-test/t/select.test: Auto merged ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged scripts/make_binary_distribution.sh: Auto merged configure.in: After merge fixes myisam/mi_search.c: After merge fixes mysql-test/r/select.result: After merge fixes sql/item.cc: After merge fixes sql/sql_parse.cc: After merge fixes sql/sql_update.cc: After merge fixes
37c98812