mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
f095274fe8
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 |
||
---|---|---|
.. | ||
BUILD | ||
comp_err.def | ||
init_db.sql | ||
install_test_db.ncf | ||
isamchk.def | ||
isamlog.def | ||
libmysql.def | ||
libmysql.imp | ||
libmysqlmain.c | ||
Makefile.am | ||
my_manage.c | ||
my_manage.h | ||
my_print_defaults.def | ||
myisam_ftdump.def | ||
myisamchk.def | ||
myisamlog.def | ||
myisampack.def | ||
mysql.def | ||
mysql.xdc | ||
mysql_fix_privilege_tables.pl | ||
mysql_install.def | ||
mysql_install_db.c | ||
mysql_install_db.def | ||
mysql_secure_installation.pl | ||
mysql_test_run.c | ||
mysql_test_run.def | ||
mysql_waitpid.def | ||
mysqladmin.def | ||
mysqlbinlog.def | ||
mysqlcheck.def | ||
mysqld.def | ||
mysqld_safe.c | ||
mysqld_safe.def | ||
mysqldump.def | ||
mysqlimport.def | ||
mysqlshow.def | ||
mysqltest.def | ||
pack_isam.def | ||
perror.def | ||
replace.def | ||
resolve_stack_dump.def | ||
resolveip.def | ||
static_init_db.sql | ||
test_db.sql |