mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 20:11:42 +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 |
||
|---|---|---|
| .. | ||
| ftbench | ||
| .cvsignore | ||
| ChangeLog | ||
| ft_boolean_search.c | ||
| ft_eval.c | ||
| ft_eval.h | ||
| ft_nlq_search.c | ||
| ft_parser.c | ||
| ft_static.c | ||
| ft_stem.c | ||
| ft_stopwords.c | ||
| ft_test1.c | ||
| ft_test1.h | ||
| ft_update.c | ||
| ftdefs.h | ||
| fulltext.h | ||
| make-ccc | ||
| Makefile.am | ||
| mi_cache.c | ||
| mi_changed.c | ||
| mi_check.c | ||
| mi_checksum.c | ||
| mi_close.c | ||
| mi_create.c | ||
| mi_dbug.c | ||
| mi_delete.c | ||
| mi_delete_all.c | ||
| mi_delete_table.c | ||
| mi_dynrec.c | ||
| mi_extra.c | ||
| mi_info.c | ||
| mi_key.c | ||
| mi_keycache.c | ||
| mi_locking.c | ||
| mi_log.c | ||
| mi_open.c | ||
| mi_packrec.c | ||
| mi_page.c | ||
| mi_panic.c | ||
| mi_preload.c | ||
| mi_range.c | ||
| mi_rename.c | ||
| mi_rfirst.c | ||
| mi_rkey.c | ||
| mi_rlast.c | ||
| mi_rnext.c | ||
| mi_rnext_same.c | ||
| mi_rprev.c | ||
| mi_rrnd.c | ||
| mi_rsame.c | ||
| mi_rsamepos.c | ||
| mi_scan.c | ||
| mi_search.c | ||
| mi_static.c | ||
| mi_statrec.c | ||
| mi_test1.c | ||
| mi_test2.c | ||
| mi_test3.c | ||
| mi_test_all.res | ||
| mi_test_all.sh | ||
| mi_unique.c | ||
| mi_update.c | ||
| mi_write.c | ||
| myisam_ftdump.c | ||
| myisamchk.c | ||
| myisamdef.h | ||
| myisamlog.c | ||
| myisampack.c | ||
| NEWS | ||
| rt_index.c | ||
| rt_index.h | ||
| rt_key.c | ||
| rt_key.h | ||
| rt_mbr.c | ||
| rt_mbr.h | ||
| rt_split.c | ||
| rt_test.c | ||
| sort.c | ||
| sp_defs.h | ||
| sp_key.c | ||
| sp_test.c | ||
| test_pack | ||
| TODO | ||