unknown f095274fe8 merge with 4.1 ... BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged Docs/Support/texi2html: Auto merged Makefile.am: Auto merged client/Makefile.am: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/my_time.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/include/row0mysql.h: Auto merged innobase/row/row0sel.c: Auto merged libmysql/libmysql.c: Auto merged libmysqld/examples/Makefile.am: Auto merged myisam/mi_check.c: Auto merged mysql-test/include/ps_modify.inc: Auto merged mysql-test/install_test_db.sh: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/r/bdb.result: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/ctype_recoding.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_if.result: Auto merged mysql-test/t/derived.test: Auto merged mysql-test/t/insert.test: merge with 4.1 Fixed test case to not use 'if exists' when it shouldn't mysql-test/t/range.test: merge with 4.1 Added missing drop table sql/ha_ndbcluster.cc: merge with 4.1 Simple optimization: use max() instead of ? : sql/item_func.cc: merge with 4.1 (Added back old variable names for easier merges) sql/opt_range.cc: merge with 4.1 Removed argument 'parent_alloc' from QUICK_RANGE_SELECT as this was not used Added assert if using QUICK_GROUP_MIN_MAX_SELECT with parent_alloc as the init() function can't handle this Changed back get_quick_select_for_ref() to use it's own alloc root becasue this function may be called several times for one query sql/sql_handler.cc: merge with 4.1 change variable 'err' to 'error' as same function had a label named 'err' sql/sql_update.cc: Use multi-update code from 5.0 instead of 4.1 We will fix the locking code shortly in 5.0 to be faster than in 4.1		2004-10-29 19:26:52 +03:00
..
.cvsignore
client_priv.h	Dumping BLOBs in HEX notation. The patch was orinigally	2004-10-19 10:40:59 +05:00
completion_hash.cc
completion_hash.h
get_password.c
Makefile.am	merge with 4.1	2004-10-29 19:26:52 +03:00
my_readline.h
mysql.cc	Fix compiler warnings (detected by Intel's C++ compiler)	2004-10-22 18:44:51 +03:00
mysqladmin.c	Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1	2004-10-07 22:09:14 +03:00
mysqlbinlog.cc
mysqlcheck.c	Fixed a bug in password handling. All related to Bug#5955.	2004-10-07 22:08:17 +03:00
mysqldump.c	merge with 4.1	2004-10-29 19:26:52 +03:00
mysqlimport.c	Review of all code pushed since last review	2004-10-20 01:28:42 +03:00
mysqlmanager-pwgen.c
mysqlmanagerc.c
mysqlshow.c	Fixed a bug in password handling. All related to Bug#5955.	2004-10-07 22:08:17 +03:00
mysqltest.c	merge with 4.1	2004-10-29 19:26:52 +03:00
readline.cc
sql_string.cc
sql_string.h