mirror of
https://github.com/MariaDB/server.git
synced 2025-04-21 20:06:07 +03:00
3936 Commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
|
3ad01d00f2 |
error messages: name the storage engine explicitly,
instead of "used storage engine" and similar changes. |
||
|
ffbd15eb32 | post-review comments and other minor edits | ||
|
050d7d6d75 | optimize discovery for cases when the storage engine is known in advance | ||
|
32ee15d851 | Assisted discovery | ||
|
db7809e817 | dead code, remove unused argument | ||
|
a53200d4e7 |
remove HA_CREATE_INFO::frm_only - it's internal server flag,
not part of the SE API, and, again, mutually exclusive with C_ORDINARY_CREATE and C_CREATE_SELECT. |
||
|
0c4cf3c7e5 | small cleanup | ||
|
e71cda83c6 |
cleanup: merge two mutually dependent function arguments into one,
eliminating reduncancy and a possibility of setting them to a pair of invalid values. |
||
|
336da6e270 | cleanup | ||
|
2d788ff5ca |
test_sql_discovery storage engine
use it to test main test cases with need_full_discover_for_existence > 0 |
||
|
4853c7192d | discovery using sql CREATE TABLE statement | ||
|
e06cb31719 |
CREATE TABLE and frm-less discovering engines.
Now CREATE TABLE does not write the frm file on disk, if the engine can discover it |
||
|
b3e70c4ae7 | split mysql_create_frm() in create_frm_image() and writefrm() | ||
|
cdc01e29d3 |
remove dd_frm_type(), dd_frm_storage_engine(), dd_check_storage_engine_flag()
from everywhere - now RENAME, SHOW FULL TABLES, and TRUNCATE work with discovery. improve error messages in truncate |
||
|
07b2523918 | rename a handler method to more precisely reflect what kind of a hack it does | ||
|
a489ae89b9 |
fix mysql_rm_table_no_locks() not to use dd_frm_type, because the frm file
may not exist (the table exists only in the engine). |
||
|
e5a323e107 |
single table discovery: handlerton::discover_table() method.
fixes for need_full_discover_for_existence mode |
||
|
6a839ff40d | handlerton::discover_table_existence() method | ||
|
b0a5dd73fa |
* remove ha_check_if_table_exists() and get_table_share_with_discover().
* rename check_if_table_exists() -> table_exists() and remove unneeded arguments |
||
|
87a9d60ec6 |
revert
" revision-id: sanja@askmonty.org-20110511110948-4kdevwzomvk56y1w committer: sanja@askmonty.org branch nick: work-maria-5.1-CREATE-merge timestamp: Wed 2011-05-11 14:09:48 +0300 Bugfix: New table creation/renaming block added if old encoded table present " the old behavior was less inconsistent than the new one. In the new one the error message was sometimes different (under LOCK TABLES e.g.), and there were race conditions (if this CREATE happened when a concurrent ALTER has renamed the old table away but haven't put the new table in place) The old one was like "(when using old table names) for DML #mysql50# prefix is optional, for DDL it's required". |
||
|
163882665e |
* don't use 1-8 numbers for open_table_error codes, use an enum.
* print "table doesn't exist in engine" when a table doesn't exist in the engine, instead of "file not found" (if no file was involved) * print a complete filename that cannot be found ('t1.MYI', not 't1') * it's not an error for a DROP if a table doesn't exist in the engine (or some table files cannot be found) - if the DROP succeeded regardless |
||
|
5ad68a0d2f |
don't use I_S constants for open_table_def and get_table_share,
have a specially defined enum with clearly named values |
||
|
09ece94fac |
remove handlerton::find_files (new implementation is coming),
and handlerton::table_exists_in_engine (new implementation is coming), and handlerton::license (redundant) |
||
|
028ce66c9e | simplify test case | ||
|
73d39bba95 |
Merge from the latest mariadb-10.0.
added: include/mysql/service_kill_statement.h libmysql/libmysql_rpm_version.in libmysql/rpm_support.cc libservices/kill_statement_service.c mysql-test/include/ctype_heap.inc mysql-test/include/ctype_strtoll10.inc mysql-test/r/change_user_notembedded.result mysql-test/r/create_delayed.result mysql-test/r/ctype_utf16le.result mysql-test/r/failed_auth_3909.result mysql-test/r/gis2.result mysql-test/r/grant_lowercase.result mysql-test/r/group_by_innodb.result mysql-test/r/information_schema2.result mysql-test/suite/innodb/r/innodb_bug14704286.result mysql-test/suite/innodb/t/innodb_bug14704286.test mysql-test/suite/plugins/r/audit_null_debug.result mysql-test/suite/plugins/r/cassandra.result mysql-test/suite/plugins/r/cassandra_qcache.result mysql-test/suite/plugins/t/audit_null_debug.test mysql-test/suite/plugins/t/cassandra.opt mysql-test/suite/plugins/t/cassandra.test mysql-test/suite/plugins/t/cassandra_qcache.opt mysql-test/suite/plugins/t/cassandra_qcache.test mysql-test/suite/rpl/r/rpl_password_boundaries.result mysql-test/suite/rpl/t/rpl_password_boundaries.test mysql-test/suite/sys_vars/r/innodb_locking_fake_changes_basic.result mysql-test/suite/sys_vars/r/innodb_max_bitmap_file_size_basic.result mysql-test/suite/sys_vars/t/innodb_locking_fake_changes_basic.test mysql-test/suite/sys_vars/t/innodb_max_bitmap_file_size_basic.test mysql-test/t/change_user_notembedded.test mysql-test/t/create_delayed.test mysql-test/t/ctype_utf16le.test mysql-test/t/failed_auth_3909.test mysql-test/t/gis2.test mysql-test/t/grant_lowercase.opt mysql-test/t/grant_lowercase.test mysql-test/t/group_by_innodb.test mysql-test/t/information_schema2.test packaging/rpm-uln/ packaging/rpm-uln/CMakeLists.txt packaging/rpm-uln/README-ULN packaging/rpm-uln/README.mysql-docs packaging/rpm-uln/filter-requires-mysql.sh packaging/rpm-uln/generate-tarball.sh packaging/rpm-uln/my.cnf packaging/rpm-uln/my_config.h packaging/rpm-uln/mysql-5.5-errno.patch packaging/rpm-uln/mysql-5.5-fix-tests.patch packaging/rpm-uln/mysql-5.5-libdir.patch packaging/rpm-uln/mysql-5.5-mtr1.patch packaging/rpm-uln/mysql-5.5-stack-guard.patch packaging/rpm-uln/mysql-5.5-testing.patch packaging/rpm-uln/mysql-chain-certs.patch packaging/rpm-uln/mysql-embedded-check.c packaging/rpm-uln/mysql-expired-certs.patch packaging/rpm-uln/mysql-install-test.patch packaging/rpm-uln/mysql-strmov.patch packaging/rpm-uln/mysql.init packaging/rpm-uln/mysql.spec.sh packaging/rpm-uln/scriptstub.c scripts/mysql_performance_tables.sql storage/cassandra/ storage/cassandra/CMakeLists.txt storage/cassandra/cassandra.cnf storage/cassandra/cassandra_se.cc storage/cassandra/cassandra_se.h storage/cassandra/gen-cpp/ storage/cassandra/gen-cpp/Cassandra.cpp storage/cassandra/gen-cpp/Cassandra.h storage/cassandra/gen-cpp/Cassandra_server.skeleton.cpp storage/cassandra/gen-cpp/cassandra_constants.cpp storage/cassandra/gen-cpp/cassandra_constants.h storage/cassandra/gen-cpp/cassandra_types.cpp storage/cassandra/gen-cpp/cassandra_types.h storage/cassandra/ha_cassandra.cc storage/cassandra/ha_cassandra.h storage/innobase/mysql-test/storage_engine/alter_tablespace.rdiff renamed: mysql-test/include/mysqlbinlog_row_engine.inc => mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc mysql-test/r/mysqlbinlog-cp932.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result mysql-test/r/mysqlbinlog2.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result mysql-test/r/mysqlbinlog_base64.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result mysql-test/r/mysqlbinlog_row.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result mysql-test/r/mysqlbinlog_row_innodb.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result mysql-test/r/mysqlbinlog_row_myisam.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result mysql-test/r/mysqlbinlog_row_trans.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result mysql-test/suite/innodb/t/innodb-autoinc-master.opt => mysql-test/suite/innodb/t/innodb-autoinc.opt mysql-test/t/mysqlbinlog-cp932-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt mysql-test/t/mysqlbinlog-cp932.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test mysql-test/t/mysqlbinlog2-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog2-master.opt mysql-test/t/mysqlbinlog2.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test mysql-test/t/mysqlbinlog_base64.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test mysql-test/t/mysqlbinlog_row-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row-master.opt mysql-test/t/mysqlbinlog_row.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test mysql-test/t/mysqlbinlog_row_innodb-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb-master.opt mysql-test/t/mysqlbinlog_row_innodb.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test mysql-test/t/mysqlbinlog_row_myisam-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam-master.opt mysql-test/t/mysqlbinlog_row_myisam.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test mysql-test/t/mysqlbinlog_row_trans-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans-master.opt mysql-test/t/mysqlbinlog_row_trans.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test mysql-test/t/plugin_load_option-master.opt => mysql-test/t/plugin_load_option.opt modified: BUILD/FINISH.sh BUILD/SETUP.sh CMakeLists.txt TODO VERSION client/completion_hash.cc client/mysql.cc client/mysql_upgrade.c client/mysqlbinlog.cc client/mysqlcheck.c client/mysqldump.c client/mysqltest.cc cmake/build_configurations/mysql_release.cmake cmake/character_sets.cmake cmake/configure.pl cmake/cpack_rpm.cmake cmake/create_initial_db.cmake.in cmake/info_macros.cmake.in cmake/install_layout.cmake cmake/mysql_version.cmake cmake/package_name.cmake cmake/plugin.cmake debian/dist/Debian/mariadb-server-10.0.files debian/dist/Debian/rules debian/dist/Ubuntu/mariadb-server-10.0.files debian/dist/Ubuntu/rules debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch extra/comp_err.c extra/replace.c extra/resolve_stack_dump.c include/hash.h include/heap.h include/m_ctype.h include/ma_dyncol.h include/my_dir.h include/my_global.h include/my_pthread.h include/my_sys.h include/my_tree.h include/myisamchk.h include/mysql.h.pp include/mysql/plugin.h include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h.pp include/mysql/service_thd_wait.h include/mysql/services.h include/mysql_com.h include/service_versions.h include/violite.h libmysql/CMakeLists.txt libmysql/libmysql.c libmysqld/CMakeLists.txt libmysqld/emb_qcache.cc libmysqld/lib_sql.cc libservices/CMakeLists.txt mysql-test/extra/binlog_tests/binlog.test mysql-test/include/have_dbi_dbd-mysql.inc mysql-test/include/plugin.defs mysql-test/include/rpl_start_server.inc mysql-test/lib/v1/mysql-test-run.pl mysql-test/mysql-test-run.pl mysql-test/r/alias.result mysql-test/r/contributors.result mysql-test/r/create.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_utf16.result mysql-test/r/ctype_utf32.result mysql-test/r/ctype_utf8.result mysql-test/r/datetime_456.result mysql-test/r/derived_view.result mysql-test/r/distinct.result mysql-test/r/dyncol.result mysql-test/r/func_encrypt_ucs2.result mysql-test/r/func_gconcat.result mysql-test/r/func_misc.result mysql-test/r/func_time.result mysql-test/r/group_by.result mysql-test/r/group_min_max.result mysql-test/r/handlersocket.result mysql-test/r/loaddata.result mysql-test/r/mysql.result mysql-test/r/mysqltest.result mysql-test/r/plugin.result mysql-test/r/plugin_auth.result mysql-test/r/show_check.result mysql-test/r/show_explain.result mysql-test/r/sp.result mysql-test/r/sp_notembedded.result mysql-test/r/stat_tables_par.result mysql-test/r/stat_tables_par_innodb.result mysql-test/r/subselect.result mysql-test/r/subselect3.result mysql-test/r/subselect3_jcl6.result mysql-test/r/subselect4.result mysql-test/r/subselect_innodb.result mysql-test/r/subselect_mat_cost.result mysql-test/r/subselect_no_mat.result mysql-test/r/subselect_no_opts.result mysql-test/r/subselect_no_scache.result mysql-test/r/subselect_sj.result mysql-test/r/subselect_sj_jcl6.result mysql-test/r/sum_distinct-big.result mysql-test/r/type_year.result mysql-test/r/user_var.result mysql-test/r/view.result mysql-test/suite.pm mysql-test/suite/binlog/r/binlog_database.result mysql-test/suite/binlog/r/binlog_row_annotate.result mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result mysql-test/suite/engines/funcs/r/tc_rename_error.result mysql-test/suite/engines/iuds/r/insert_time.result mysql-test/suite/funcs_1/datadict/processlist_priv.inc mysql-test/suite/funcs_1/datadict/processlist_val.inc mysql-test/suite/funcs_1/r/innodb_func_view.result mysql-test/suite/funcs_1/r/is_columns_is.result mysql-test/suite/funcs_1/r/is_columns_is_embedded.result mysql-test/suite/funcs_1/r/memory_func_view.result mysql-test/suite/funcs_1/r/myisam_func_view.result mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result mysql-test/suite/funcs_1/r/processlist_priv_ps.result mysql-test/suite/funcs_1/r/processlist_val_no_prot.result mysql-test/suite/funcs_1/r/processlist_val_ps.result mysql-test/suite/innodb/r/binlog_consistent.result mysql-test/suite/innodb/r/innodb-autoinc.result mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/r/innodb_bug53591.result mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result mysql-test/suite/innodb/t/innodb-autoinc.test mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb.test mysql-test/suite/innodb/t/innodb_bug53591.test mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test mysql-test/suite/maria/truncate.result mysql-test/suite/maria/truncate.test mysql-test/suite/multi_source/multisource.result mysql-test/suite/multi_source/multisource.test mysql-test/suite/perfschema/include/upgrade_check.inc mysql-test/suite/perfschema/r/digest_table_full.result mysql-test/suite/perfschema/r/func_file_io.result mysql-test/suite/perfschema/r/func_mutex.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/statement_digest.result mysql-test/suite/perfschema/r/statement_digest_consumers.result mysql-test/suite/perfschema/r/statement_digest_long_query.result mysql-test/suite/perfschema/t/func_file_io.test mysql-test/suite/perfschema/t/func_mutex.test mysql-test/suite/plugins/suite.pm mysql-test/suite/rpl/r/rpl_semi_sync.result mysql-test/suite/rpl/t/rpl_semi_sync.test mysql-test/suite/sphinx/sphinx.result mysql-test/suite/storage_engine/misc.result mysql-test/suite/sys_vars/r/character_set_client_basic.result mysql-test/suite/sys_vars/r/character_set_connection_basic.result mysql-test/suite/sys_vars/r/character_set_database_basic.result mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result mysql-test/suite/sys_vars/r/character_set_results_basic.result mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result mysql-test/suite/sys_vars/r/innodb_changed_pages_limit_basic.result mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test mysql-test/suite/sys_vars/t/innodb_changed_pages_limit_basic.test mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test mysql-test/suite/vcol/r/vcol_misc.result mysql-test/suite/vcol/t/vcol_misc.test mysql-test/t/alias.test mysql-test/t/ctype_ucs.test mysql-test/t/ctype_utf16.test mysql-test/t/ctype_utf32.test mysql-test/t/ctype_utf8.test mysql-test/t/derived_view.test mysql-test/t/distinct.test mysql-test/t/dyncol.test mysql-test/t/file_contents.test mysql-test/t/func_gconcat.test mysql-test/t/func_misc.test mysql-test/t/group_by.test mysql-test/t/group_min_max.test mysql-test/t/loaddata.test mysql-test/t/mysql.test mysql-test/t/plugin.test mysql-test/t/plugin_auth.test mysql-test/t/show_check.test mysql-test/t/show_explain.test mysql-test/t/sp.test mysql-test/t/sp_notembedded.test mysql-test/t/stat_tables_par.test mysql-test/t/subselect4.test mysql-test/t/subselect_innodb.test mysql-test/t/subselect_sj.test mysql-test/t/sum_distinct-big.test mysql-test/t/user_var.test mysql-test/t/view.test mysql-test/valgrind.supp mysys/array.c mysys/charset-def.c mysys/default.c mysys/hash.c mysys/ma_dyncol.c mysys/mf_tempdir.c mysys/my_alloc.c mysys/my_chmod.c mysys/my_chsize.c mysys/my_copy.c mysys/my_create.c mysys/my_delete.c mysys/my_error.c mysys/my_fopen.c mysys/my_fstream.c mysys/my_getwd.c mysys/my_lib.c mysys/my_lock.c mysys/my_malloc.c mysys/my_open.c mysys/my_pread.c mysys/my_read.c mysys/my_redel.c mysys/my_rename.c mysys/my_seek.c mysys/my_sync.c mysys/my_thr_init.c mysys/my_write.c mysys/mysys_priv.h mysys/safemalloc.c mysys/string.c mysys/tree.c mysys/waiting_threads.c plugin/feedback/utils.cc scripts/CMakeLists.txt scripts/mysql_install_db.pl.in scripts/mysql_install_db.sh scripts/mysql_system_tables.sql scripts/mysql_system_tables_fix.sql scripts/mysqlaccess.sh scripts/mysqld_multi.sh scripts/mysqld_safe.sh sql-common/client.c sql-common/client_plugin.c sql/CMakeLists.txt sql/debug_sync.cc sql/event_data_objects.cc sql/event_db_repository.cc sql/event_scheduler.cc sql/events.cc sql/field.cc sql/field.h sql/filesort.cc sql/filesort_utils.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/hostname.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_create.cc sql/item_create.h sql/item_func.cc sql/item_func.h sql/item_geofunc.cc sql/item_geofunc.h sql/item_row.cc sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_sum.cc sql/item_sum.h sql/item_timefunc.cc sql/item_timefunc.h sql/item_xmlfunc.cc sql/item_xmlfunc.h sql/lex.h sql/log.cc sql/log_event.cc sql/log_event.h sql/log_event_old.cc sql/mdl.cc sql/mysqld.cc sql/mysqld.h sql/net_serv.cc sql/opt_range.cc sql/opt_range_mrr.cc sql/opt_subselect.cc sql/protocol.cc sql/records.cc sql/rpl_filter.cc sql/rpl_handler.cc sql/rpl_handler.h sql/rpl_mi.cc sql/rpl_mi.h sql/rpl_rli.cc sql/rpl_tblmap.cc sql/rpl_utility.cc sql/scheduler.cc sql/set_var.cc sql/set_var.h sql/slave.cc sql/sp.cc sql/sp_head.cc sql/sp_pcontext.cc sql/sp_rcontext.cc sql/sp_rcontext.h sql/sql_acl.cc sql/sql_analyse.h sql/sql_array.h sql/sql_audit.cc sql/sql_audit.h sql/sql_base.cc sql/sql_base.h sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_const.h sql/sql_db.cc sql/sql_delete.cc sql/sql_error.cc sql/sql_error.h sql/sql_handler.cc sql/sql_help.cc sql/sql_insert.cc sql/sql_join_cache.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_list.h sql/sql_load.cc sql/sql_parse.cc sql/sql_plugin.cc sql/sql_plugin_services.h sql/sql_prepare.cc sql/sql_priv.h sql/sql_profile.cc sql/sql_profile.h sql/sql_reload.cc sql/sql_repl.cc sql/sql_repl.h sql/sql_select.cc sql/sql_servers.cc sql/sql_show.cc sql/sql_signal.cc sql/sql_statistics.cc sql/sql_string.cc sql/sql_string.h sql/sql_table.cc sql/sql_test.cc sql/sql_time.cc sql/sql_trigger.cc sql/sql_truncate.cc sql/sql_udf.cc sql/sql_union.cc sql/sql_update.cc sql/sql_yacc.yy sql/sys_vars.cc sql/sys_vars.h sql/table.cc sql/table.h sql/thr_malloc.cc sql/thr_malloc.h sql/tztime.cc sql/uniques.cc sql/unireg.cc storage/archive/ha_archive.cc storage/archive/ha_archive.h storage/csv/ha_tina.cc storage/federated/ha_federated.cc storage/federated/ha_federated.h storage/federatedx/federatedx_io_mysql.cc storage/federatedx/ha_federatedx.cc storage/federatedx/ha_federatedx.h storage/heap/ha_heap.cc storage/heap/heapdef.h storage/heap/hp_block.c storage/heap/hp_create.c storage/heap/hp_open.c storage/heap/hp_write.c storage/innobase/btr/btr0btr.cc storage/innobase/btr/btr0cur.cc storage/innobase/buf/buf0buf.cc storage/innobase/buf/buf0lru.cc storage/innobase/dict/dict0dict.cc storage/innobase/fil/fil0fil.cc storage/innobase/fts/fts0fts.cc storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/ibuf/ibuf0ibuf.cc storage/innobase/include/btr0cur.h storage/innobase/include/dict0mem.h storage/innobase/include/fil0fil.h storage/innobase/include/lock0lock.h storage/innobase/include/page0zip.h storage/innobase/include/row0undo.h storage/innobase/include/row0upd.ic storage/innobase/lock/lock0lock.cc storage/innobase/log/log0recv.cc storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff storage/innobase/os/os0file.cc storage/innobase/page/page0cur.cc storage/innobase/page/page0page.cc storage/innobase/page/page0zip.cc storage/innobase/row/row0mysql.cc storage/innobase/row/row0sel.cc storage/innobase/row/row0umod.cc storage/innobase/row/row0undo.cc storage/maria/ha_maria.cc storage/maria/ma_bitmap.c storage/maria/ma_blockrec.c storage/maria/ma_check.c storage/maria/ma_ft_boolean_search.c storage/maria/ma_ft_nlq_search.c storage/maria/ma_ft_parser.c storage/maria/ma_loghandler.c storage/maria/ma_open.c storage/maria/ma_sort.c storage/maria/ma_write.c storage/maria/maria_pack.c storage/maria/unittest/sequence_storage.c storage/myisam/ft_boolean_search.c storage/myisam/ft_nlq_search.c storage/myisam/ft_parser.c storage/myisam/ft_stopwords.c storage/myisam/mi_check.c storage/myisam/mi_open.c storage/myisam/mi_write.c storage/myisam/myisamchk.c storage/myisam/myisamlog.c storage/myisam/myisampack.c storage/myisam/sort.c storage/myisammrg/ha_myisammrg.cc storage/myisammrg/mysql-test/storage_engine/vcol.rdiff storage/perfschema/pfs.cc storage/perfschema/pfs_check.cc storage/perfschema/pfs_instr.cc storage/perfschema/pfs_server.cc storage/sphinx/ha_sphinx.cc storage/xtradb/btr/btr0cur.c storage/xtradb/btr/btr0pcur.c storage/xtradb/buf/buf0lru.c storage/xtradb/buf/buf0rea.c storage/xtradb/fsp/fsp0fsp.c storage/xtradb/handler/ha_innodb.cc storage/xtradb/handler/ha_innodb.h storage/xtradb/handler/i_s.cc storage/xtradb/ibuf/ibuf0ibuf.c storage/xtradb/include/btr0btr.h storage/xtradb/include/btr0cur.h storage/xtradb/include/log0online.h storage/xtradb/include/srv0srv.h storage/xtradb/include/univ.i storage/xtradb/include/ut0ut.h storage/xtradb/include/ut0ut.ic storage/xtradb/lock/lock0lock.c storage/xtradb/log/log0log.c storage/xtradb/log/log0online.c storage/xtradb/os/os0file.c storage/xtradb/row/row0ins.c storage/xtradb/row/row0mysql.c storage/xtradb/row/row0upd.c storage/xtradb/srv/srv0srv.c storage/xtradb/srv/srv0start.c strings/ctype-latin1.c strings/ctype-ucs2.c strings/my_vsnprintf.c support-files/compiler_warnings.supp support-files/mysql.spec.sh tests/mysql_client_test.c vio/viosocket.c win/create_def_file.js mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test pending merges: Sergei Golubchik 2013-03-28 MDEV-4207 Invalid code in fts_savepoint_rele... Alexander Barkov 2013-03-28 Fixing test failure in the previous comm... Alexander Barkov 2013-03-28 Merging utf16le from MySQL-5.6 Vladislav Vaintroub 2013-02-19 MDEV-156 Threadpool - add thd_wait_be... Michael Widenius 2013-02-15 [merge] Automatic merge Elena Stepanova 2013-02-08 Fix for MDEV-4149, backport from 10.0: timour@askmonty.org 2013-02-07 MDEV-537 Make multi-column non-top le... Sergei Golubchik 2013-02-05 set THR_THD key and current_thd=NULL as ... sanja@askmonty.org 2013-02-04 [merge] merge sanja@askmonty.org 2013-02-04 MDEV-3873: post-merge fix. Sergei Golubchik 2013-02-04 missing cast added Sergey Petrunya 2013-02-04 Skip cassandra_qcache.test if there is no... Sergey Petrunya 2013-02-04 [merge] Merge fix for MDEV-3997. Sergey Petrunya 2013-02-04 MDEV-3997: Querying a Cassandra table on ... Sergey Petrunya 2013-02-04 Fix mysql-test/suite/plugins/suite.pm to ... sanja@askmonty.org 2013-02-04 [merge] merge sanja@askmonty.org 2013-02-04 MDEV-4091: Dynamic columns C functions... knielsen@knielse... 2013-01-31 MDEV-4121: binlog.binlog_row_binlog s... Sergei Golubchik 2013-02-02 remove "invisible sysvars" oxymoron Sergei Golubchik 2013-01-31 fix for a valgrind builds. Sergei Golubchik 2013-01-31 avoid mtr errors for --plugin-add=EXAMPL... Sergei Golubchik 2013-01-31 skip cassandra.test unless cassandra is ... Sergei Golubchik 2013-01-31 [merge] 10.0-base merge Sergei Golubchik 2013-01-30 don't disable the cassandra engine by de... knielsen@knielse... 2013-01-30 MDEV-3984: Double free of Master_info... Sergei Golubchik 2013-01-29 move cassandra-related code from cmake/c... Sergei Golubchik 2013-01-29 buildbot fixes for storage/cassandra/CMa... Sergei Golubchik 2013-01-29 [merge] 5.5 merge Sergei Golubchik 2013-01-29 more changes for fedora18 Sergei Golubchik 2013-01-29 fix 'compat' rpm for fedora18 Vladislav Vaintroub 2013-01-28 fix embedded build with for cmake 2.6... timour@askmonty.org 2013-01-28 Fix for MDEV-3948, and backport of th... Sergei Golubchik 2013-01-28 [merge] 5.3 merge Sergei Golubchik 2013-01-28 [merge] 5.2 merge Sergei Golubchik 2013-01-28 compilation error with -Wuninitialized -... Sergei Golubchik 2013-01-25 [merge] 5.1 merge Sergei Golubchik 2013-01-25 MDEV-729 lp:998028 - Server crashes on n... Sergei Golubchik 2013-01-25 MDEV-759 lp:998340 - Valgrind complains ... Sergei Golubchik 2013-01-26 MDEV-3875 Wrong result (missing row) on ... sanja@askmonty.org 2013-01-25 The problem was that expression with f... sanja@askmonty.org 2013-01-28 MDEV-4091: Dynamic columns C functions... Vladislav Vaintroub 2013-01-26 [merge] Merge MDEV-3842, MDEV-3923, M... Vladislav Vaintroub 2013-01-25 fix embedded Vladislav Vaintroub 2013-01-25 Fix embedded build Vladislav Vaintroub 2013-01-25 MDEV-3842, MDEV-3923 : Vladislav Vaintroub 2013-01-25 MDEV-3971 : problems installing Mari... Michael Widenius 2013-01-26 [merge] Automatic merge Michael Widenius 2013-01-25 Fixed MDEV-3890: Server crash inserting ... Sergei Golubchik 2013-01-25 [merge] 5.3 merge Sergei Golubchik 2013-01-25 [merge] 5.2 merge Sergei Golubchik 2013-01-25 MDEV-4040 Replace deprecated SET OPTION ... Sergei Golubchik 2013-01-25 MDEV-3909 remote user enumeration Sergei Golubchik 2013-01-25 report "using password: YES/NO" correctl... Sergei Golubchik 2013-01-25 MDEV-3915 COM_CHANGE_USER allows fast pa... Igor Babaev 2013-01-23 [merge] Merge 5.3->5.5 Igor Babaev 2013-01-21 [merge] Merge 5.2->5.3 Igor Babaev 2013-01-21 [merge] Merge 5.1->5.2 Igor Babaev 2013-01-21 [merge] Merge. Igor Babaev 2013-01-21 Fixed bug mdev-4063 (bug #56927). Sergei Golubchik 2013-01-21 MDEV-4029 SELECT on information_schema u... Igor Babaev 2013-01-19 Corrected the test case for bug mdev-3938. Igor Babaev 2013-01-16 Corrected the fix for bug mdev-3938. Igor Babaev 2013-01-15 Fixed bug mdev-3938. sanja@montyprogr... 2013-01-16 MDEV-4056 fix. timour@askmonty.org 2013-01-17 MDEV-3900 Optimizer difference betwee... sanja@montyprogr... 2013-01-17 backport of: sanja@montyprogr... 2013-01-16 MDEV-3988 fix. Igor Babaev 2013-01-11 Fixed bug mdev-4025. Vladislav Vaintroub 2013-01-11 MDEV-4020 : Make sure strmov symbol i... Sergei Golubchik 2013-01-23 remove one particularly stupid test Sergei Golubchik 2013-01-21 MDEV-4069 thd_wait_end does not called i... sanja@montyprogr... 2013-01-22 Fixed typo in the function name. sanja@montyprogr... 2013-01-21 MDEV-3873: fixed functions absend in ... Sergei Golubchik 2013-01-20 fix a strict aliasing warning - remove a... Sergei Golubchik 2013-01-20 MDEV-3952 Incompatible change in MariaDB... Sergei Golubchik 2013-01-20 MDEV-3934 Assertion `((keypart_map+1) & ... Sergei Golubchik 2013-01-20 MDEV-4029 SELECT on information_schema u... Sergei Golubchik 2013-01-19 MDEV-3832 MariaDB conflicts with package... Sergei Golubchik 2013-01-18 MDEV-633 lp:1024058 - mysqld XA crash in... Sergei Golubchik 2013-01-18 simplify THD::binlog_setup_trx_data() usage Sergei Golubchik 2013-01-18 MDEV-3908 crash in multi-table delete an... Sergei Golubchik 2013-01-18 MDEV-4065 thd_kill_statement service Vladislav Vaintroub 2013-01-18 Fix Windows installers' bootstrapper ... Michael Widenius 2013-01-17 Don't reset maybe_null in update_used_ta... Michael Widenius 2013-01-17 Fixed compiler warning Sergei Golubchik 2013-01-16 [merge] xtradb merge. Percona-Server-5.5... Sergei Golubchik 2013-01-15 Percona-Server-5.5.28-rel29.3 Sergei Golubchik 2013-01-15 Test case and a different fix for MySQL ... Sergei Golubchik 2013-01-15 small cleanups Sergei Golubchik 2013-01-15 backport a test case for a 5.5 bug fix f... Sergei Golubchik 2013-01-15 [merge] mysql-5.5.29 merge Dmitry Lenev 2012-12-10 Bug #15954896 "SP, MULTI-TABLE DELETE AND LO... mysql-builder@or... 2012-12-07 Harin Vadodaria 2012-12-06 Bug#15912213: BUFFER OVERFLOW IN ACL_GET() Gleb Shchepa 2012-12-05 Bug #15948123: SERVER WORKS INCORRECT WITH L... Gleb Shchepa 2012-12-05 Bug #15948123: SERVER WORKS INCORRECT WITH L... Joerg Bruehe 2012-11-08 Building RPMs for ULN: Joerg Bruehe 2012-11-08 Placement change: Tor Didriksen 2012-11-01 [merge] merge 5.1 => 5.5 Venkata Sidagam 2012-10-31 BUG#13556441: CHECK AND REPAIR TABLE SHOU... Ashish Agarwal 2012-10-31 [merge] BUG#14485479: Merge into mysql-5.5... Ashish Agarwal 2012-10-31 BUG#14485479: INSTALL AUDIT PLUGIN HANGS I... Anirudh Mangipudi 2012-10-30 [merge] BUG#11754894: MYISAMCHK ERROR H... Anirudh Mangipudi 2012-10-30 [merge] BUG#11754894: MYISAMCHK ERROR H... Anirudh Mangipudi 2012-10-30 BUG#11754894: MYISAMCHK ERROR HAS INCOR... Shivji Kumar Jha 2012-10-30 [merge] BUG#14659685: main.mysqlbinlog_r... mysql-builder@or... 2012-10-29 mysql-builder@or... 2012-10-29 [merge] mysql-builder@or... 2012-10-29 Alexander Nozdrin 2012-10-29 [merge] Merge from 5.1. Tor Didriksen 2012-10-24 Bug#14737559 BZR JOIN PLUGIN TREES INTO INT... Tor Didriksen 2012-10-23 [merge] local merge Tor Didriksen 2012-10-23 Use MESSAGE(STATUS ...) as we don't want an... Marko Mäkelä 2012-10-22 [merge] Merge mysql-5.1 to mysql-5.5. Nuno Carvalho 2012-10-21 [merge] BUG#14629727: USER_VAR_EVENT IS MIS... Nuno Carvalho 2012-10-21 [merge] BUG#14629727: USER_VAR_EVENT IS MIS... Nuno Carvalho 2012-10-21 [merge] BUG#14629727: USER_VAR_EVENT IS MIS... Nuno Carvalho 2012-10-12 [merge] BUG#14629727: USER_VAR_EVENT IS MIS... Joerg Bruehe 2012-10-19 Fix formatting in 'INFO_BIN' on Windows - ba... Joerg Bruehe 2012-10-19 [merge] Upmerge a backport - empty Annamalai Gurusami 2012-10-19 Bug #14226171 EXCESSIVE ROW LOCKING W... Neeraj Bisht 2012-10-18 [merge] Bug#13726751 - 8 BYTE MEMORY LEAK IN... Marko Mäkelä 2012-10-18 [merge] Merge mysql-5.1 to mysql-5.5. Krunal Bauskar 2012-10-17 [merge] merge from mysql-5.1 -> mysql-5.5 Krunal Bauskar 2012-10-17 removing .... will re-add using merge. for... Tatjana Azundris... 2012-10-17 [merge] NULL merge mysql-builder@or... 2012-10-17 [merge] mysql-builder@or... 2012-08-27 mysql-builder@or... 2012-08-22 mysql-builder@or... 2012-08-22 mysql-builder@or... 2012-08-09 mysql-builder@or... 2012-08-09 mysql-builder@or... 2012-08-08 mysql-builder@or... 2012-07-25 mysql-builder@or... 2012-07-24 mysql-builder@or... 2012-07-23 mysql-builder@or... 2012-07-23 mysql-builder@or... 2012-07-20 mysql-builder@or... 2012-07-19 mysql-builder@or... 2012-07-19 mysql-builder@or... 2012-07-18 mysql-builder@or... 2012-07-17 mysql-builder@or... 2012-06-28 mysql-builder@or... 2012-06-22 mysql-builder@or... 2012-06-21 mysql-builder@or... 2012-06-20 mysql-builder@or... 2012-06-20 mysql-builder@or... 2012-06-19 mysql-builder@or... 2012-06-11 mysql-builder@or... 2012-06-08 mysql-builder@or... 2012-06-04 mysql-builder@or... 2012-04-28 mysql-builder@or... 2012-02-16 mysql-builder@or... 2011-06-28 mysql-builder@or... 2011-06-09 mysql-builder@or... 2011-04-18 mysql-builder@or... 2011-03-18 mysql-builder@or... 2011-03-11 mysql-builder@or... 2011-03-05 mysql-builder@or... 2011-03-04 mysql-builder@or... 2011-03-02 mysql-builder@or... 2011-03-02 mysql-builder@or... 2011-03-02 mysql-builder@or... 2011-03-01 mysql-builder@or... 2011-02-22 mysql-builder@or... 2011-02-22 mysql-builder@or... 2011-02-14 mysql-builder@or... 2011-02-09 [merge] mysql-builder@or... 2011-02-09 mysql-builder@or... 2011-02-09 mysql-builder@or... 2011-02-08 mysql-builder@or... 2011-02-08 mysql-builder@or... 2011-02-09 mysql-builder@or... 2011-02-05 mysql-builder@or... 2010-12-29 mysql-builder@or... 2010-12-29 mysql-builder@or... 2010-12-28 mysql-builder@or... 2010-12-27 mysql-builder@or... 2010-09-06 mysql-builder@or... 2010-08-09 mysql-builder@or... 2010-06-23 mysql-builder@or... 2010-06-09 mysql-builder@or... 2010-06-08 mysql-builder@or... 2012-02-16 mysql-builder@or... 2012-01-31 mysql-builder@or... 2012-01-26 mysql-builder@or... 2011-09-08 mysql-builder@or... 2011-09-08 mysql-builder@or... 2011-09-28 mysql-builder@or... 2011-09-01 mysql-builder@or... 2011-08-30 mysql-builder@or... 2011-08-26 mysql-builder@or... 2011-08-24 mysql-builder@or... 2011-08-18 mysql-builder@or... 2011-07-22 mysql-builder@or... 2011-05-20 mysql-builder@or... 2011-03-22 mysql-builder@or... 2011-01-21 mysql-builder@or... 2011-01-20 mysql-builder@or... 2011-01-19 mysql-builder@or... 2011-01-19 mysql-builder@or... 2011-01-19 mysql-builder@or... 2011-01-13 mysql-builder@or... 2011-01-13 mysql-builder@or... 2011-01-07 [merge] mysql-builder@or... 2011-01-06 mysql-builder@or... 2011-01-06 mysql-builder@or... 2010-11-30 mysql-builder@or... 2010-11-25 mysql-builder@or... 2010-11-25 mysql-builder@or... 2010-11-25 mysql-builder@or... 2010-11-25 mysql-builder@or... 2012-08-28 mysql-builder@or... 2012-07-25 mysql-builder@or... 2012-03-19 mysql-builder@or... 2011-12-21 mysql-builder@or... 2011-09-21 [merge] mysql-builder@or... 2011-08-19 [merge] mysql-builder@or... 2011-08-18 mysql-builder@or... 2011-08-15 mysql-builder@or... 2011-07-28 mysql-builder@or... 2011-07-26 mysql-builder@or... 2011-07-26 mysql-builder@or... 2011-06-20 mysql-builder@or... 2011-06-14 mysql-builder@or... 2011-06-11 mysql-builder@or... 2011-06-10 mysql-builder@or... 2011-06-10 mysql-builder@or... 2011-06-10 mysql-builder@or... 2011-06-09 mysql-builder@or... 2011-06-06 mysql-builder@or... 2011-06-03 mysql-builder@or... 2011-06-02 mysql-builder@or... 2011-06-01 mysql-builder@or... 2011-06-01 mysql-builder@or... 2011-06-01 mysql-builder@or... 2011-06-01 mysql-builder@or... 2011-06-01 mysql-builder@or... 2011-06-01 mysql-builder@or... 2011-06-01 mysql-builder@or... 2011-05-30 mysql-builder@or... 2011-05-30 mysql-builder@or... 2011-05-30 mysql-builder@or... 2011-05-30 mysql-builder@or... 2011-05-30 mysql-builder@or... 2011-05-26 mysql-builder@or... 2011-05-26 mysql-builder@or... 2011-05-26 mysql-builder@or... 2011-05-26 mysql-builder@or... 2011-05-26 mysql-builder@or... 2011-05-25 mysql-builder@or... 2011-05-25 mysql-builder@or... 2011-05-25 mysql-builder@or... 2011-05-25 mysql-builder@or... 2011-05-25 mysql-builder@or... 2011-05-25 mysql-builder@or... 2012-10-17 mysql-builder@or... 2012-10-16 mysql-builder@or... 2012-09-21 mysql-builder@or... 2011-11-17 mysql-builder@or... 2011-09-28 mysql-builder@or... 2011-09-28 mysql-builder@or... 2011-09-21 [merge] mysql-builder@or... 2011-09-08 mysql-builder@or... 2011-09-07 mysql-builder@or... 2011-09-07 mysql-builder@or... 2011-09-07 [merge] mysql-builder@or... 2011-09-02 mysql-builder@or... 2011-09-01 mysql-builder@or... 2011-09-01 mysql-builder@or... 2011-05-20 mysql-builder@or... 2011-04-28 mysql-builder@or... 2011-04-28 mysql-builder@or... 2011-02-04 mysql-builder@or... 2010-11-29 mysql-builder@or... 2010-11-27 mysql-builder@or... 2010-11-23 mysql-builder@or... 2010-11-18 mysql-builder@or... 2010-11-18 mysql-builder@or... 2010-11-18 mysql-builder@or... 2010-11-18 mysql-builder@or... 2010-10-29 mysql-builder@or... 2010-10-29 mysql-builder@or... 2010-10-16 mysql-builder@or... 2010-10-16 mysql-builder@or... 2010-10-16 mysql-builder@or... 2010-10-15 mysql-builder@or... 2010-10-15 mysql-builder@or... 2010-10-15 mysql-builder@or... 2010-10-15 mysql-builder@or... 2010-10-14 mysql-builder@or... 2010-10-14 mysql-builder@or... 2010-10-13 mysql-builder@or... 2010-10-12 mysql-builder@or... 2010-10-12 mysql-builder@or... 2010-10-12 Yasufumi Kinoshita 2012-10-17 [merge] Bug #13702112 : WAIT_FOR_READ ... Tatjana Azundris... 2012-10-17 [merge] Bug#11764559: UMASK IS IGNORE... Neeraj Bisht 2012-10-16 [merge] Bug#11745891 - LAST_INSERT(ID) DOES ... mysql-builder@or... 2012-10-16 Marko Mäkelä 2012-10-16 [merge] Merge mysql-5.1 to mysql-5.5. Krunal Bauskar 2012-10-15 removed warning message as they have chang... Krunal Bauskar 2012-10-15 bug#14704286 Marc Alff 2012-10-12 [merge] Merge mysql-5.1 --> mysql-5.5 Vasil Dimov 2012-10-10 [merge] Null merge mysql-5.1 -> mysql-5.5 (th... Vasil Dimov 2012-10-09 [merge] Merge mysql-5.1 -> mysql-5.5 Harin Vadodaria 2012-10-09 Bug #14211140: CRASH WHEN GRANTING OR REV... Annamalai Gurusami 2012-10-09 Fixing a compilation issue. Praveenkumar Hul... 2012-10-08 Bug#11756600 - SLAVE THREAD CAN CRASH... Annamalai Gurusami 2012-10-08 Bug #14036214 MYSQLD CRASHES WHEN EXEC... Marko Mäkelä 2012-10-08 [merge] Merge mysql-5.1 to mysql-5.5. Jon Olav Hauglid 2012-10-04 Bug#14640599 MEMORY LEAK WHEN EXECUTING ... Tor Didriksen 2012-10-03 Bug#13713525 CREATE_INITIAL_DB.CMAKE IS FAI... Jon Olav Hauglid 2012-10-03 Bug#14495351: CRASH IN HA_PARTITION::HAN... Mattias Jonsson 2012-09-10 Bug#14495351: CRASH IN HA_PARTITION::HAND... Serge Kozlov 2012-10-02 BUG#12604949. Increased timeout for switchin... Tor Didriksen 2012-10-01 [merge] merge 5.1 => 5.5 Joerg Bruehe 2012-10-01 [merge] Empty upmerge of 5.1.66 into 5.5 hery.ramilison@o... 2012-10-01 Merge from mysql-5.5.28-release Annamalai Gurusami 2012-09-28 [merge] Merge from mysql-5.1 to mysql-... mysql-builder@or... 2012-09-27 Akhila Maddukuri 2012-09-27 Description: mysql-builder@or... 2012-09-26 [merge] Akhila Maddukuri 2012-09-26 [merge] Description: Tor Didriksen 2012-09-25 [merge] merge 5.1 => 5.5 mysql-builder@or... 2012-09-25 [merge] mysql-builder@or... 2012-09-25 [merge] Jon Olav Hauglid 2012-09-25 [merge] Merge from mysql-5.1 to mysql-5.5 Raghav Kapoor 2012-09-25 [merge] BUG#13864642: DROP/CREATE USER BEHA... Rohit Kalhans 2012-09-23 [merge] bug#14548159: upmerge from mysql-5.... Rohit Kalhans 2012-09-22 [merge] upmerge to bug#14548159 Nirbhay Choubey 2012-09-21 [merge] Merge of fix for Bug#14645196 fro... Joerg Bruehe 2012-09-21 [merge] Merge changes for ULN RPMs into main... Joerg Bruehe 2012-09-18 Spec file for ULN RPMs: Joerg Bruehe 2012-07-26 Spec file: Declare conflicts with the ULN RPMs. Joerg Bruehe 2012-07-26 ULN spec file: Some comment or message text ... Joerg Bruehe 2012-07-26 Spec file: transfer the 'runselftest' macro ... Joerg Bruehe 2012-07-26 Spec file for ULN RPMs: Joerg Bruehe 2012-07-26 Spec file polishing: Handle 'MySQL-*' and 'm... Joerg Bruehe 2012-07-25 [merge] Merge 5.5.27 into the tree for ULN R... Joerg Bruehe 2012-06-14 Copyright text in the spec file for ULN RPMs. Joerg Bruehe 2012-06-12 One file still missing for ULN RPMs. Joerg Bruehe 2012-06-12 Still work on getting the "SPECIFIC-ULN/" fi... Joerg Bruehe 2012-06-11 Protect traditional RPMs that "SPECIFIC-ULN/... Joerg Bruehe 2012-06-11 cmake syntax error: missed ${...} Joerg Bruehe 2012-06-11 Files in "SPECIFIC-ULN" need to be mentioned... Joerg Bruehe 2012-06-11 Adape "SPECIFIC-ULN/mysql-5.5-libdir.patch" ... Joerg Bruehe 2012-06-11 More changes to supporting the build of RPMs... Joerg Bruehe 2012-06-08 First version of supporting the build of RPM... Inaam Rana 2012-09-20 Bug#14594600 ASSERT FROM DROP TABLE CONCURRENT... mysql-builder@or... 2012-09-20 Marko Mäkelä 2012-09-20 [merge] Null merge mysql-5.1 to mysql-5.5. Marko Mäkelä 2012-09-20 Do not try innodb_change_buffering_debug=2. Marko Mäkelä 2012-09-19 [merge] Merge mysql-5.1 to mysql-5.5. Tor Didriksen 2012-09-18 Bug#14542543 FIX BUG #12694872 IN 5.5 Marko Mäkelä 2012-09-17 [merge] Null merge mysql-5.1 to mysql-5.5. Marko Mäkelä 2012-09-17 [merge] Merge mysql-5.5 to working copy. Harin Vadodaria 2012-09-17 [merge] Bug#11753779: MAX_CONNECT_ERRORS ... Marko Mäkelä 2012-09-17 [merge] Merge mysql-5.1 to mysql-5.5. Sujatha Sivakumar 2012-09-17 [merge] merge from 5.1 to 5.5 mysql-builder@or... 2012-09-12 [merge] Tor Didriksen 2012-09-12 [merge] merge 5.1 => 5.5 Georgi Kodinov 2012-09-11 [merge] merge Jon Olav Hauglid 2012-09-11 WL#6454: Deprecate SHOW AUTHORS and SHOW... Georgi Kodinov 2012-08-27 Bug #13548161: MYSQLD_SAFE IMPROVEMENTS FO... Georgi Kodinov 2012-08-24 Bug #14181049: MYSQL_INSTALL_DB.PL CREATES... Andrei Elkin 2012-09-10 [merge] merge bug14597605 to 5.5. Marc Alff 2012-09-07 [merge] Local merge Marc Alff 2012-09-07 [merge] local merge Akhil Mohan 2012-09-07 [merge] Empty version change upmerge Marc Alff 2012-09-07 Bug#14072995 - PERFSCHEMA.FUNC_FILE_IO FAILS WI... Marc Alff 2012-09-07 Bug#14100113 - PERFSCHEMA.FUNC_MUTEX FAILS WITH... Tor Didriksen 2012-09-07 Bug#14593123 CONFIGURE.PL WITH CMAKE2.8 BRE... Tor Didriksen 2012-09-05 [merge] merge 5.1 => 5.5 Annamalai Gurusami 2012-09-04 Bug #14500557 CRASH WHEN USING LONG IN... Annamalai Gurusami 2012-09-03 [merge] Merge from mysql-5.1 to mysql-... Annamalai Gurusami 2012-09-01 [merge] Merge from mysql-5.1 to mysql-... mysql-builder@or... 2012-08-31 [merge] Marko Mäkelä 2012-08-30 [merge] Merge mysql-5.1 to mysql-5.5. Jorgen Loland 2012-08-30 [merge] Null-merge from 5.1 mysql-builder@or... 2012-08-29 Tor Didriksen 2012-08-28 [merge] merge 5.5.28-release => 5.5 mysql-builder@or... 2012-08-27 Aditya A 2012-08-27 Bug#14145950 AUTO_INCREMENT ON DOUBLE WILL FAIL ... hery.ramilison@o... 2012-08-24 Raise version number after cloning 5.... Sergei Golubchik 2013-01-15 update debian patch to apply Sergei Golubchik 2013-01-15 [merge] 5.3 merge Sergei Golubchik 2013-01-10 [merge] 5.2->5.3 merge Sergei Golubchik 2013-01-10 [merge] 5.1 merge Sergei Golubchik 2013-01-09 [merge] mysql-5.1.67 merge Joerg Bruehe 2012-12-07 Last-minute fix to 5.1.67, akhil.mohan@orac... 2012-11-29 applying patch for BUG15912213 Tor Didriksen 2012-11-01 Bug#14840488 VALGRIND ERRORS IN MYSQL_CLIEN... Anirudh Mangipudi 2012-10-30 BUG#11754894: MYISAMCHK ERROR HAS INCOR... Shivji Kumar Jha 2012-10-30 BUG#14659685 - main.mysqlbinlog_row_myis... mysql-builder@or... 2012-10-29 Alexander Nozdrin 2012-10-29 Fix sp_notembedded.test. Marko Mäkelä 2012-10-22 Backport from 5.6: Bug#14769820 ASSERT FLEN ... Nuno Carvalho 2012-10-21 BUG#14629727: USER_VAR_EVENT IS MISSING RAN... Nuno Carvalho 2012-10-21 [merge] BUG#14629727: USER_VAR_EVENT IS MIS... Nuno Carvalho 2012-10-12 BUG#14629727: USER_VAR_EVENT IS MISSING RAN... Joerg Bruehe 2012-10-19 [merge] Automerge into main 5.1 Joerg Bruehe 2012-09-11 Backport this change from MySQL 5.5 to 5.1: Neeraj Bisht 2012-10-18 Bug#13726751 - 8 BYTE MEMORY LEAK IN DO_SAVE... Marko Mäkelä 2012-10-18 Bug#14758405: ALTER TABLE: ADDING SERIAL NUL... Krunal Bauskar 2012-10-17 bug#14765606: ensure select is active befo... Tatjana Azundris... 2012-10-17 [merge] Bug#11764559: UMASK IS IGNORE... Tatjana Azundris... 2012-10-17 Bug#11764559: UMASK IS IGNORED BY ERR... Yasufumi Kinoshita 2012-10-17 Bug #13702112 : WAIT_FOR_READ IS STUCK... Neeraj Bisht 2012-10-16 Bug#11745891 - LAST_INSERT(ID) DOES NOT SUPP... Marko Mäkelä 2012-10-16 Bug#14729221 IN-PLACE ALTER TABLE REPORTS ''... Krunal Bauskar 2012-10-15 bug#14704286 Marc Alff 2012-10-12 Bug#14629232 SECURITY VULNERABILITY WITH SHOW P... Vasil Dimov 2012-10-10 Fix compilation error in debug mode: Vasil Dimov 2012-10-09 Port the test for Bug#14708715 from 5.1/innod... Vasil Dimov 2012-10-09 Update the ChangeLog with the fix of Bug#1470... Vasil Dimov 2012-10-09 Fix Bug#14708715 CREATE TABLE MEMORY LEAK ON ... Marko Mäkelä 2012-10-08 Bug#14731482 UPDATE OR DELETE CORRUPTS A REC... Tor Didriksen 2012-10-01 Bug#14683676 ENDLESS MEMORY CONSUMPTION IN ... Joerg Bruehe 2012-10-01 [merge] Merge 5.1.66 into main 5.1 Annamalai Gurusami 2012-09-28 Bug #13249921 ASSERT !BPAGE->FILE_PAGE... mysql-builder@or... 2012-09-26 Akhila Maddukuri 2012-09-26 Description: Tor Didriksen 2012-09-25 Backport mysql-builder@or... 2012-09-25 mysql-builder@or... 2012-09-25 Jon Olav Hauglid 2012-09-25 Bug#14621627 THREAD CACHE IS UNFAIR Raghav Kapoor 2012-09-25 BUG#13864642: DROP/CREATE USER BEHAVING ODDLY Rohit Kalhans 2012-09-23 BUG#14548159: Followup patch to fix some is... Rohit Kalhans 2012-09-22 BUG#14548159: NUMEROUS CASES OF INCORRECT I... Nirbhay Choubey 2012-09-21 Bug#14645196 MYSQL CLIENT'S USE COMMAND F... mysql-builder@or... 2012-09-20 Marko Mäkelä 2012-09-19 Bug#14636528 INNODB CHANGE BUFFERING IS NOT ... Marko Mäkelä 2012-09-17 [merge] Merge mysql-5.1 to working copy. Harin Vadodaria 2012-09-17 Bug#11753779: MAX_CONNECT_ERRORS WORKS ON... Marko Mäkelä 2012-09-17 Bug#12701488 ASSERT PAGE_ZIP_VALIDATE, UNIV_... Sujatha Sivakumar 2012-09-17 Bug#11750014:ASSERTION TRX_DATA->EMPTY(... mysql-builder@or... 2012-09-12 Tor Didriksen 2012-09-12 Backport Bug#13724099 Andrei Elkin 2012-09-10 [merge] merge bug14597605 to the main repo. Andrei Elkin 2012-09-10 Bug#14597605 Issue with Null-value user on s... akhil.mohan@orac... 2012-09-07 Raise version number after cloning 5.... Sergei Golubchik 2012-12-04 proactive s/strmov/strnmov/ in sql_acl.c... Vladislav Vaintroub 2012-12-21 [merge] merge Vladislav Vaintroub 2012-12-21 Support VS2012. Exclude compiler-defi... Vladislav Vaintroub 2012-12-21 [merge] merge Vladislav Vaintroub 2012-12-06 MDEV-3918: myisamchk bogus error for... Sergei Golubchik 2012-12-11 one-byte overflow with old passwords Vladislav Vaintroub 2012-11-26 Fix broken feedback plugin after MDEV... Vladislav Vaintroub 2012-11-23 MDEV-712 - LP:1024239 - Mysqlclient... Vladislav Vaintroub 2012-11-22 [merge] merge 5.1 Vladislav Vaintroub 2012-11-22 Feedback plugin now recognizes Windo... Sergei Golubchik 2013-01-08 MDEV-3942 FROM_DAYS(<timestamp column>) ... sanja@askmonty.org 2012-12-28 MDEV-3873 & MDEV-3876 & MDEV-3912 : Wr... timour@askmonty.org 2012-12-19 MDEV-3928: Assertion `example' failed... sanja@montyprogr... 2012-12-05 MDEV-3914 fix. Sergei Golubchik 2012-11-23 bump the version to 5.3.11 Igor Babaev 2012-11-22 [merge] Merge Igor Babaev 2012-11-21 Fixed LP bug #1002146 (bug mdev-645). Sergei Golubchik 2013-01-15 remove thd_mark_as_hard_kill() timour@askmonty.org 2013-01-15 Fix for bug MDEV-3992, second attempt timour@askmonty.org 2013-01-14 Fix for bug MDEV-3992 Michael Widenius 2013-01-11 Buildbot fixes and cleanups: Michael Widenius 2013-01-11 Fixed crashing bug in GROUP_CONCAT with ... Michael Widenius 2013-01-11 Fixed problem with failing mysql_upgrade... Michael Widenius 2013-01-11 Fixed MDEV-4013: Password length in repl... Michael Widenius 2013-01-11 Fixed some race conditons and bugs relat... Michael Widenius 2013-01-10 Fix for MDEV-4009: main.delayed sporadic... Sergei Golubchik 2013-01-09 MDEV-3846 REFRESH_CHECKPOINT and REFRESH... Sergei Golubchik 2013-01-09 MDEV-3985 crash: uninstall soname 'a' Sergei Golubchik 2013-01-08 MDEV-3883 Show global status not in order Sergei Golubchik 2013-01-08 MDEV-3987 uninitialized read in Item_con... Sergei Golubchik 2013-01-07 non-functional cleanup, clarifying CONVE... Sergei Golubchik 2013-01-28 my_alloca() when it's mapped to malloc()... Sergei Golubchik 2013-01-24 fix ha_cassandra to compile Sergei Golubchik 2013-01-24 workaround for incorrectly (?) generated... Sergei Golubchik 2013-01-24 race conditions in show_explain.test Sergei Golubchik 2013-01-23 main.partition_myisam crashes in embedded. Sergei Golubchik 2013-01-23 fix the failing federated.federated_inno... Sergei Golubchik 2013-01-23 32-bit fix: first cast the value to a si... Sergei Golubchik 2013-01-23 test suite fixes Sergei Golubchik 2013-01-23 cleanup: Sergei Golubchik 2013-01-23 cleanup: Sergei Golubchik 2013-01-23 cleanup: remove unused init_dynamic_arra... Sergei Golubchik 2013-01-23 cleanup: use MYF() for mysys flags Michael Widenius 2013-01-23 MDEV-4011 Added per thread memory counti... Jani Tolonen 2013-01-23 MDEV-3931 Cassandra SE packaging knielsen@knielse... 2013-01-21 Fix uninitialised variable in binlog ... knielsen@knielse... 2013-01-16 Fix missing #include Elena Stepanova 2013-01-16 [merge] MDEV-3990: engine tests went out ... Elena Stepanova 2013-01-13 MDEV-3990: engine tests went out of sync ... sanja@askmonty.org 2013-01-14 Compiler warning fixed. Igor Babaev 2013-01-13 [merge] Merged the fix for bug mdev-4019. Igor Babaev 2013-01-13 Fixed bug mdev-4019. sanja@askmonty.org 2013-01-11 Windows compiler warnings fix. sanja@askmonty.org 2013-01-11 Fix windows compiler warnings. sanja@askmonty.org 2013-01-10 fixed crossplatform double values repr... Sergey Petrunya 2013-01-10 MDEV-3982: show_explain.test fails, times... sanja@askmonty.org 2013-01-10 32 bit systems warnings fixed. sanja@askmonty.org 2013-01-10 append_identifier() declaration fixed. sanja@askmonty.org 2013-01-10 fix cassandra SE test to be working in... sanja@askmonty.org 2013-01-10 Make cassandra not built by default sanja@askmonty.org 2013-01-10 [merge] Cassandra SE merge sanja@askmonty.org 2013-01-10 Make cassandra module and do not load ... sanja@askmonty.org 2013-01-09 fixed feature counter. sanja@askmonty.org 2013-01-09 The library interface fixed. sanja@askmonty.org 2013-01-09 MDEV-4005 fix. Sergey Petrunya 2012-12-24 Post-merge fixes: sanja@askmonty.org 2012-12-23 [merge] pre-merge sanja@askmonty.org 2012-12-23 Post-post review fixes. sanja@askmonty.org 2012-12-23 backport to 5.5 dyncol changes and nam... Sergey Petrunya 2012-12-20 Cassandra Storage Engine: Address review ... Sergey Petrunya 2012-12-20 Cassandra Storage Engine: Address review ... Sergey Petrunya 2012-12-20 Cassandra Storage Engine: sanja@montyprogr... 2012-09-30 Check of deleting whole dynamic columns. sanja@montyprogr... 2012-09-29 Fix of MDEV-565: Server crashes in ha... Sergey Petrunya 2012-09-28 Include cassandra storage engine in tarballs Sergey Petrunya 2012-09-28 Fix compile: expect Thrift where it is at... Sergey Petrunya 2012-09-28 Fix compile warnings sanja@montyprogr... 2012-09-28 Ending spaces removed. sanja@montyprogr... 2012-09-28 MDEV-506 Cassandra dynamic columns ac... sanja@montyprogr... 2012-09-28 MDEV-377 Name support for dynamic col... Sergey Petrunya 2012-09-27 Cassandra SE: lazy connections Sergey Petrunya 2012-09-27 Cassandra SE Sergey Petrunya 2012-09-26 - Update testcases Sergey Petrunya 2012-09-26 Cassandra SE: Sergey Petrunya 2012-09-26 Cassandra SE: Add capability to retry fai... Sergey Petrunya 2012-09-25 Cassandra SE: more datatypes support Sergey Petrunya 2012-09-24 Cassandra SE: varint datatype support: Sergey Petrunya 2012-09-24 Cassandra SE Sergey Petrunya 2012-09-22 Cassandra SE: make consistency settings u... Sergey Petrunya 2012-09-20 Cassandra SE: Sergey Petrunya 2012-09-16 Cassandra SE: Sergey Petrunya 2012-09-14 MDEV-530: Cassandra SE: Locking is incorrect Sergey Petrunya 2012-09-14 Cassandra SE Sergey Petrunya 2012-09-14 Cassandra SE Sergey Petrunya 2012-09-12 Cassandra SE: small optimization: StringC... Sergey Petrunya 2012-09-12 Update test results after last cset Sergey Petrunya 2012-09-10 Cassandra SE: add support for reading cou... Sergey Petrunya 2012-09-10 Cassandra SE Sergey Petrunya 2012-09-07 Cassandra SE: added support for boolean t... Sergey Petrunya 2012-08-31 MDEV-498: Cassandra: Inserting a timestam... Sergey Petrunya 2012-08-31 Cassandra SE Sergey Petrunya 2012-08-29 Cassandra SE: fix batched insert to flush... Sergey Petrunya 2012-08-29 Fix for the previous cset: Field::store_T... Sergey Petrunya 2012-08-29 Cassandra SE: Timestamp data type support. Sergey Petrunya 2012-08-29 Cassandra SE Sergey Petrunya 2012-08-29 Cassandra storage engine: add @@rnd_batch... Sergey Petrunya 2012-08-28 MDEV-494, part #1: phantom row for big fu... Sergey Petrunya 2012-08-28 MDEV-480: TRUNCATE TABLE on a Cassandra t... Sergey Petrunya 2012-08-27 Cassandra storage engine: BKA support Sergey Petrunya 2012-08-26 Cassandra storage engine: bulk INSERT sup... Sergey Petrunya 2012-08-23 - Enable mapping of CHAR(n) Sergey Petrunya 2012-08-23 # MDEV-476: Cassandra: Server crashes in ... Sergey Petrunya 2012-08-21 Make ha_cassandra work with filesort(). Sergey Petrunya 2012-08-20 Read records in batches when doing full t... Sergey Petrunya 2012-08-19 position() and rnd_pos() implementations. Sergey Petrunya 2012-08-19 MDEV-431: Cassandra storage engine Sergey Petrunya 2012-08-19 MDEV-431: Cassandra storage engine Sergey Petrunya 2012-08-18 MDEV-431: Cassandra storage engine Sergey Petrunya 2012-08-18 MDEV-431: Cassandra storage engine Sergey Petrunya 2012-08-18 MDEV-431: Cassandra storage engine Sergey Petrunya 2012-08-17 Initial commit for Cassandra storage engine. |
||
|
993ea79f2d | 5.5 merge | ||
|
068c61978e | Temporary commit of 10.0-merge | ||
|
b6bd199850 |
Bug #16051728 SERVER CRASHES IN ADD_IDENTIFIER ON CONCURRENT ALTER TABLE AND
SHOW ENGINE INNOD Problem: The purpose of explain_filename() is to provide useful additional information regarding the partitions given the filename. This function was returning an error when it was not able to parse the given filename. For example, within InnoDB, temporary files are created with #sql- prefix. But this function was not able to parse it correctly. Solution: It is not an error, if explain_filename() could not parse the given filename. If there is no partition information to explain, then silently return from the function. rb#1940 approved by mattiasj |
||
|
63dc91d7da |
Bug #16051728 SERVER CRASHES IN ADD_IDENTIFIER ON CONCURRENT ALTER TABLE AND
SHOW ENGINE INNOD Problem: The purpose of explain_filename() is to provide useful additional information regarding the partitions given the filename. This function was returning an error when it was not able to parse the given filename. For example, within InnoDB, temporary files are created with #sql- prefix. But this function was not able to parse it correctly. Solution: It is not an error, if explain_filename() could not parse the given filename. If there is no partition information to explain, then silently return from the function. rb#1940 approved by mattiasj |
||
|
ab1c228836 |
Fix for assert found by mysql-test-run
sql/sql_table.cc: Don't call allow_access_to_protected_table() if we haven't protected table against usage. Table is mainly protected against usage when one disables keys with alter table. |
||
|
e2a72fefb4 |
Fixed issue with LOCK TABLE + ALTER TABLE ENABLE KEYS + SHOW commands.
sql/sql_table.cc: Remove version protection from share when repair has been done. Without this one can't run SHOW commands on the table if it was locked until it's unlocked. sql/table.h: Allow one to remove version protection with allow_access_to_protected_table() |
||
|
4cace76d4d | Automatic merge | ||
|
8ed283d882 |
Fixed bug MPDEV-628 / LP:989055 - Querying myisam table metadata may corrupt the table.
The issue was that there was that SHOW commands could open the table in the store engine, even in cases where it should not be allowed to do that (ie, the storage engines meta data for that table was under big changes). The cases where this should not be allowed are: - ALTER TABLE DISABLE KEYS - ALTER TABLE ENABLE KEYS - REPAIR TABLE - OPTIMIZE TABLE - DROP TABLE This patch adds a new mode, protected_against_usage(). If this is used then the SHOW command will wait until the table is accessable. This is implemented by re-using the already exising 'version' flag for TABLE_SHARE. It also added functions to be used to change TABLE_SHARE->version instead of changing it directly. mysql-test/r/myisam-metadata.result: Added test case mysql-test/t/myisam-metadata.test: Added test case sql/mysqld.cc: Start from refresh_version 2 as 0 and 1 are reserved. sql/sql_admin.cc: Added MYSQL_OPEN_FOR_REPAIR Updated call to wait_while_table_is_used() sql/sql_base.cc: Updated call to wait_while_table_is_used() - Allow one to specify how the table should be removed (for all commands except show or for all commands). - Don't allow one to reopen the table if one has called share->protect_against_usage() sql/sql_base.h: Added TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE, which is used to mark that no one can reopen this table, except with MYSQL_OPEN_FOR_REPAIR . - Added MYSQL_OPEN_FOR_REPAIR - Updated prototype for wait_while_table_is_used() sql/sql_table.cc: Updated call to wait_while_table_is_used() Use MYSQL_OPEN_FOR_REPAIR for open tables that where repaired. sql/sql_truncate.cc: Updated call to wait_while_table_is_used() sql/table.cc: Use set_refresh_version() sql/table.h: Added functions to be used to change TABLE_SHARE->version instead of changing it directly |
||
|
213f1c76a0 | 5.3->5.5 merge | ||
|
c4341d5095 | 5.2 -> 5.3 | ||
|
5dec570d7c | 5.1 -> 5.2 merge | ||
|
8161c6772d | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | ||
|
08ba257846 |
mysql-5.1 merge
mysys/errors.c: revert upstream's fix. use a much simpler one mysys/my_write.c: revert upstream's fix. use a simpler one sql/item_xmlfunc.cc: useless, but ok sql/mysqld.cc: simplify upstream's fix storage/heap/hp_delete.c: remove upstream's fix. we'll use a much less expensive approach. |
||
|
f83588a0f9 |
Implementing pre_create option test and setting of default values.
Currently, only TABLE_TYPE is tested, and if wrong or unspecified, is replaced by the default value DOS. - Test on type was moved from create to pre_create - pre_create is now called unconditionally and must return true on error and false otherwise. - Warnings are produced if the table type was changed. - The errors have specific error messages (instead of being warnings with an error message telling that a table must have columns) Modified: ha_connect.cc ha_connect.h handler.h sql_table.cc |
||
|
e96182824d |
Bug#16274455: CAN NOT ACESS PARTITIONED TABLES WHEN
DOWNGRADED FROM 5.6.11 TO 5.6.10 Problem was new syntax not accepted by previous version. Fixed by adding version comment of /*!50531 around the new syntax. Like this in the .frm file: 'PARTITION BY KEY /*!50611 ALGORITHM = 2 */ () PARTITIONS 3' and also changing the output from SHOW CREATE TABLE to: CREATE TABLE t1 (a INT) /*!50100 PARTITION BY KEY */ /*!50611 ALGORITHM = 1 */ /*!50100 () PARTITIONS 3 */ It will always add the ALGORITHM into the .frm for KEY [sub]partitioned tables, but for SHOW CREATE TABLE it will only add it in case it is the non default ALGORITHM = 1. Also notice that for 5.5, it will say /*!50531 instead of /*!50611, which will make upgrade from 5.5 > 5.5.31 to 5.6 < 5.6.11 fail! If one downgrades an fixed version to the same major version (5.5 or 5.6) the bug 14521864 will be visible again, but unless the .frm is updated, it will work again when upgrading again. Also fixed so that the .frm does not get updated version if a single partition check passes. |
||
|
89681f6dc6 |
Bug#16274455: CAN NOT ACESS PARTITIONED TABLES WHEN
DOWNGRADED FROM 5.6.11 TO 5.6.10 Problem was new syntax not accepted by previous version. Fixed by adding version comment of /*!50531 around the new syntax. Like this in the .frm file: 'PARTITION BY KEY /*!50611 ALGORITHM = 2 */ () PARTITIONS 3' and also changing the output from SHOW CREATE TABLE to: CREATE TABLE t1 (a INT) /*!50100 PARTITION BY KEY */ /*!50611 ALGORITHM = 1 */ /*!50100 () PARTITIONS 3 */ It will always add the ALGORITHM into the .frm for KEY [sub]partitioned tables, but for SHOW CREATE TABLE it will only add it in case it is the non default ALGORITHM = 1. Also notice that for 5.5, it will say /*!50531 instead of /*!50611, which will make upgrade from 5.5 > 5.5.31 to 5.6 < 5.6.11 fail! If one downgrades an fixed version to the same major version (5.5 or 5.6) the bug 14521864 will be visible again, but unless the .frm is updated, it will work again when upgrading again. Also fixed so that the .frm does not get updated version if a single partition check passes. |
||
|
ab83952f29 | 10.0-base merge | ||
|
a260b15554 |
MDEV-4011 Added per thread memory counting and usage
Base code and idea from a patch from by plinux at Taobao. The idea is that we mark all memory that are thread specific with MY_THREAD_SPECIFIC. Memory counting is done per thread in the my_malloc_size_cb_func callback function from my_malloc(). There are plenty of new asserts to ensure that for a debug server the counting is correct. Information_schema.processlist gets two new columns: MEMORY_USED and EXAMINED_ROWS. - The later is there mainly to show how query is progressing. The following changes in interfaces was needed to get this to work: - init_alloc_root() amd init_sql_alloc() has extra option so that one can mark memory with MY_THREAD_SPECIFIC - One now have to use alloc_root_set_min_malloc() to set min memory to be allocated by alloc_root() - my_init_dynamic_array() has extra option so that one can mark memory with MY_THREAD_SPECIFIC - my_net_init() has extra option so that one can mark memory with MY_THREAD_SPECIFIC - Added flag for hash_init() so that one can mark hash table to be thread specific. - Added flags to init_tree() so that one can mark tree to be thread specific. - Removed with_delete option to init_tree(). Now one should instead use MY_TREE_WITH_DELETE_FLAG. - Added flag to Warning_info::Warning_info() if the structure should be fully initialized. - String elements can now be marked as thread specific. - Internal HEAP tables are now marking it's memory as MY_THREAD_SPECIFIC. - Changed type of myf from int to ulong, as this is always a set of bit flags. Other things: - Removed calls to net_end() and thd->cleanup() as these are now done in ~THD() - We now also show EXAMINED_ROWS in SHOW PROCESSLIST - Added new variable 'memory_used' - Fixed bug where kill_threads_for_user() was using the wrong mem_root to allocate memory. - Removed calls to the obsoleted function init_dynamic_array() - Use set_current_thd() instead of my_pthread_setspecific_ptr(THR_THD,...) client/completion_hash.cc: Updated call to init_alloc_root() client/mysql.cc: Updated call to init_alloc_root() client/mysqlbinlog.cc: init_dynamic_array() -> my_init_dynamic_array() Updated call to init_alloc_root() client/mysqlcheck.c: Updated call to my_init_dynamic_array() client/mysqldump.c: Updated call to init_alloc_root() client/mysqltest.cc: Updated call to init_alloc_root() Updated call to my_init_dynamic_array() Fixed compiler warnings extra/comp_err.c: Updated call to my_init_dynamic_array() extra/resolve_stack_dump.c: Updated call to my_init_dynamic_array() include/hash.h: Added HASH_THREAD_SPECIFIC include/heap.h: Added flag is internal temporary table. include/my_dir.h: Safety fix: Ensure that MY_DONT_SORT and MY_WANT_STAT don't interfer with other mysys flags include/my_global.h: Changed type of myf from int to ulong, as this is always a set of bit flags. include/my_sys.h: Added MY_THREAD_SPECIFIC and MY_THREAD_MOVE Added malloc_flags to DYNAMIC_ARRAY Added extra mysys flag argument to my_init_dynamic_array() Removed deprecated functions init_dynamic_array() and my_init_dynamic_array.._ci Updated paramaters for init_alloc_root() include/my_tree.h: Added my_flags to allow one to use MY_THREAD_SPECIFIC with hash tables. Removed with_delete. One should now instead use MY_TREE_WITH_DELETE_FLAG Updated parameters to init_tree() include/myisamchk.h: Added malloc_flags to allow one to use MY_THREAD_SPECIFIC for checks. include/mysql.h: Added MYSQL_THREAD_SPECIFIC_MALLOC Used 'unused1' to mark memory as thread specific. include/mysql.h.pp: Updated file include/mysql_com.h: Used 'unused1' to mark memory as thread specific. Updated parameters for my_net_init() libmysql/libmysql.c: Updated call to init_alloc_root() to mark memory thread specific. libmysqld/emb_qcache.cc: Updated call to init_alloc_root() libmysqld/lib_sql.cc: Updated call to init_alloc_root() mysql-test/r/create.result: Updated results mysql-test/r/user_var.result: Updated results mysql-test/suite/funcs_1/datadict/processlist_priv.inc: Update to handle new format of SHOW PROCESSLIST mysql-test/suite/funcs_1/datadict/processlist_val.inc: Update to handle new format of SHOW PROCESSLIST mysql-test/suite/funcs_1/r/is_columns_is.result: Update to handle new format of SHOW PROCESSLIST mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result: Updated results mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Updated results mysql-test/t/show_explain.test: Fixed usage of debug variable so that one can run test with --debug mysql-test/t/user_var.test: Added test of memory_usage variable. mysys/array.c: Added extra my_flags option to init_dynamic_array() and init_dynamic_array2() so that one can mark memory with MY_THREAD_SPECIFIC All allocated memory is marked with the given my_flags. Removed obsolete function init_dynamic_array() mysys/default.c: Updated call to init_alloc_root() Updated call to my_init_dynamic_array() mysys/hash.c: Updated call to my_init_dynamic_array_ci(). Allocated memory is marked with MY_THREAD_SPECIFIC if HASH_THREAD_SPECIFIC is used. mysys/ma_dyncol.c: init_dynamic_array() -> my_init_dynamic_array() Added #if to get rid of compiler warnings mysys/mf_tempdir.c: Updated call to my_init_dynamic_array() mysys/my_alloc.c: Added extra parameter to init_alloc_root() so that one can mark memory with MY_THREAD_SPECIFIC Extend MEM_ROOT with a flag if memory is thread specific. This is stored in block_size, to keep the size of the MEM_ROOT object identical as before. Allocated memory is marked with MY_THREAD_SPECIFIC if used with init_alloc_root() mysys/my_chmod.c: Updated DBUG_PRINT because of change of myf type mysys/my_chsize.c: Updated DBUG_PRINT because of change of myf type mysys/my_copy.c: Updated DBUG_PRINT because of change of myf type mysys/my_create.c: Updated DBUG_PRINT because of change of myf type mysys/my_delete.c: Updated DBUG_PRINT because of change of myf type mysys/my_error.c: Updated DBUG_PRINT because of change of myf type mysys/my_fopen.c: Updated DBUG_PRINT because of change of myf type mysys/my_fstream.c: Updated DBUG_PRINT because of change of myf type mysys/my_getwd.c: Updated DBUG_PRINT because of change of myf type mysys/my_lib.c: Updated call to init_alloc_root() Updated call to my_init_dynamic_array() Updated DBUG_PRINT because of change of myf type mysys/my_lock.c: Updated DBUG_PRINT because of change of myf type mysys/my_malloc.c: Store at start of each allocated memory block the size of the block and if the block is thread specific. Call malloc_size_cb_func, if set, with the memory allocated/freed. Updated DBUG_PRINT because of change of myf type mysys/my_open.c: Updated DBUG_PRINT because of change of myf type mysys/my_pread.c: Updated DBUG_PRINT because of change of myf type mysys/my_read.c: Updated DBUG_PRINT because of change of myf type mysys/my_redel.c: Updated DBUG_PRINT because of change of myf type mysys/my_rename.c: Updated DBUG_PRINT because of change of myf type mysys/my_seek.c: Updated DBUG_PRINT because of change of myf type mysys/my_sync.c: Updated DBUG_PRINT because of change of myf type mysys/my_thr_init.c: Ensure that one can call my_thread_dbug_id() even if thread is not properly initialized. mysys/my_write.c: Updated DBUG_PRINT because of change of myf type mysys/mysys_priv.h: Updated parameters to sf_malloc and sf_realloc() mysys/safemalloc.c: Added checking that for memory marked with MY_THREAD_SPECIFIC that it's the same thread that is allocation and freeing the memory. Added sf_malloc_dbug_id() to allow MariaDB to specify which THD is handling the memory. Added my_flags arguments to sf_malloc() and sf_realloc() to be able to mark memory with MY_THREAD_SPECIFIC. Added sf_report_leaked_memory() to get list of memory not freed by a thread. mysys/tree.c: Added flags to init_tree() so that one can mark tree to be thread specific. Removed with_delete option to init_tree(). Now one should instead use MY_TREE_WITH_DELETE_FLAG. Updated call to init_alloc_root() All allocated memory is marked with the given malloc flags mysys/waiting_threads.c: Updated call to my_init_dynamic_array() sql-common/client.c: Updated call to init_alloc_root() and my_net_init() to mark memory thread specific. Updated call to my_init_dynamic_array(). Added MYSQL_THREAD_SPECIFIC_MALLOC so that client can mark memory as MY_THREAD_SPECIFIC. sql-common/client_plugin.c: Updated call to init_alloc_root() sql/debug_sync.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/event_scheduler.cc: Removed calls to net_end() as this is now done in ~THD() Call set_current_thd() to ensure that memory is assigned to right thread. sql/events.cc: my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() sql/filesort.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/filesort_utils.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/ha_ndbcluster.cc: Updated call to init_alloc_root() Updated call to my_net_init() Removed calls to net_end() and thd->cleanup() as these are now done in ~THD() sql/ha_ndbcluster_binlog.cc: Updated call to my_net_init() Updated call to init_sql_alloc() Removed calls to net_end() and thd->cleanup() as these are now done in ~THD() sql/ha_partition.cc: Updated call to init_alloc_root() sql/handler.cc: Added MY_THREAD_SPECIFIC to allocated memory. Added missing call to my_dir_end() sql/item_func.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/item_subselect.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/item_sum.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/log.cc: More DBUG Updated call to init_alloc_root() sql/mdl.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/mysqld.cc: Added total_memory_used Updated call to init_alloc_root() Move mysql_cond_broadcast() before my_thread_end() Added mariadb_dbug_id() to count memory per THD instead of per thread. Added my_malloc_size_cb_func() callback function for my_malloc() to count memory. Move initialization of mysqld_server_started and mysqld_server_initialized earlier. Updated call to my_init_dynamic_array(). Updated call to my_net_init(). Call my_pthread_setspecific_ptr(THR_THD,...) to ensure that memory is assigned to right thread. Added status variable 'memory_used'. Updated call to init_alloc_root() my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() sql/mysqld.h: Added set_current_thd() sql/net_serv.cc: Added new parameter to my_net_init() so that one can mark memory with MY_THREAD_SPECIFIC. Store in net->thread_specific_malloc if memory is thread specific. Mark memory to be thread specific if requested. sql/opt_range.cc: Updated call to my_init_dynamic_array() Updated call to init_sql_alloc() Added MY_THREAD_SPECIFIC to allocated memory. sql/opt_subselect.cc: Updated call to init_sql_alloc() to mark memory thread specific. sql/protocol.cc: Fixed compiler warning sql/records.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/rpl_filter.cc: Updated call to my_init_dynamic_array() sql/rpl_handler.cc: Updated call to my_init_dynamic_array2() sql/rpl_handler.h: Updated call to init_sql_alloc() sql/rpl_mi.cc: Updated call to my_init_dynamic_array() sql/rpl_tblmap.cc: Updated call to init_alloc_root() sql/rpl_utility.cc: Updated call to my_init_dynamic_array() sql/slave.cc: Initialize things properly before calling functions that allocate memory. Removed calls to net_end() as this is now done in ~THD() sql/sp_head.cc: Updated call to init_sql_alloc() Updated call to my_init_dynamic_array() Added parameter to warning_info() that it should be fully initialized. sql/sp_pcontext.cc: Updated call to my_init_dynamic_array() sql/sql_acl.cc: Updated call to init_sql_alloc() Updated call to my_init_dynamic_array() my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() sql/sql_admin.cc: Added parameter to warning_info() that it should be fully initialized. sql/sql_analyse.h: Updated call to init_tree() to mark memory thread specific. sql/sql_array.h: Updated call to my_init_dynamic_array() to mark memory thread specific. sql/sql_audit.cc: Updated call to my_init_dynamic_array() sql/sql_base.cc: Updated call to init_sql_alloc() my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() sql/sql_cache.cc: Updated comment sql/sql_class.cc: Added parameter to warning_info() that not initialize it until THD is fully created. Updated call to init_sql_alloc() Mark THD::user_vars has to be thread specific. Updated call to my_init_dynamic_array() Ensure that memory allocated by THD is assigned to the THD. More DBUG Always acll net_end() in ~THD() Assert that all memory signed to this THD is really deleted at ~THD. Fixed set_status_var_init() to not reset memory_used. my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() sql/sql_class.h: Added MY_THREAD_SPECIFIC to allocated memory. Added malloc_size to THD to record allocated memory per THD. sql/sql_delete.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/sql_error.cc: Added 'initialize' parameter to Warning_info() to say if should allocate memory for it's structures. This is used by THD::THD() to not allocate memory until THD is ready. Added Warning_info::free_memory() sql/sql_error.h: Updated Warning_info() class. sql/sql_handler.cc: Updated call to init_alloc_root() to mark memory thread specific. sql/sql_insert.cc: More DBUG sql/sql_join_cache.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/sql_lex.cc: Updated call to my_init_dynamic_array() sql/sql_lex.h: Updated call to my_init_dynamic_array() sql/sql_load.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/sql_parse.cc: Removed calls to net_end() and thd->cleanup() as these are now done in ~THD() Ensure that examined_row_count() is reset before query. Fixed bug where kill_threads_for_user() was using the wrong mem_root to allocate memory. my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() Don't restore thd->status_var.memory_used when restoring thd->status_var sql/sql_plugin.cc: Updated call to init_alloc_root() Updated call to my_init_dynamic_array() Don't allocate THD on the stack, as this causes problems with valgrind when doing thd memory counting. my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() sql/sql_prepare.cc: Added parameter to warning_info() that it should be fully initialized. Updated call to init_sql_alloc() to mark memory thread specific. sql/sql_reload.cc: my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() sql/sql_select.cc: Updated call to my_init_dynamic_array() and init_sql_alloc() to mark memory thread specific. Added MY_THREAD_SPECIFIC to allocated memory. More DBUG sql/sql_servers.cc: Updated call to init_sql_alloc() to mark memory some memory thread specific. my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() sql/sql_show.cc: Updated call to my_init_dynamic_array() Mark my_dir() memory thread specific. Use my_pthread_setspecific_ptr(THR_THD,...) to mark that allocated memory should be allocated to calling thread. More DBUG. Added malloc_size and examined_row_count to SHOW PROCESSLIST. Added MY_THREAD_SPECIFIC to allocated memory. Updated call to init_sql_alloc() Added parameter to warning_info() that it should be fully initialized. sql/sql_statistics.cc: Fixed compiler warning sql/sql_string.cc: String elements can now be marked as thread specific. sql/sql_string.h: String elements can now be marked as thread specific. sql/sql_table.cc: Updated call to init_sql_alloc() and my_malloc() to mark memory thread specific my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() Fixed compiler warning sql/sql_test.cc: Updated call to my_init_dynamic_array() to mark memory thread specific. sql/sql_trigger.cc: Updated call to init_sql_alloc() sql/sql_udf.cc: Updated call to init_sql_alloc() my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() sql/sql_update.cc: Added MY_THREAD_SPECIFIC to allocated memory. sql/table.cc: Updated call to init_sql_alloc(). Mark memory used by temporary tables, that are not for slave threads, as MY_THREAD_SPECIFIC Updated call to init_sql_alloc() sql/thr_malloc.cc: Added my_flags argument to init_sql_alloc() to be able to mark memory as MY_THREAD_SPECIFIC. sql/thr_malloc.h: Updated prototype for init_sql_alloc() sql/tztime.cc: Updated call to init_sql_alloc() Updated call to init_alloc_root() to mark memory thread specific. my_pthread_setspecific_ptr(THR_THD,...) -> set_current_thd() sql/uniques.cc: Updated calls to init_tree(), my_init_dynamic_array() and my_malloc() to mark memory thread specific. sql/unireg.cc: Added MY_THREAD_SPECIFIC to allocated memory. storage/csv/ha_tina.cc: Updated call to init_alloc_root() storage/federated/ha_federated.cc: Updated call to init_alloc_root() Updated call to my_init_dynamic_array() Ensure that memory allocated by fedarated is registered for the system, not for the thread. storage/federatedx/federatedx_io_mysql.cc: Updated call to my_init_dynamic_array() storage/federatedx/ha_federatedx.cc: Updated call to init_alloc_root() Updated call to my_init_dynamic_array() storage/heap/ha_heap.cc: Added MY_THREAD_SPECIFIC to allocated memory. storage/heap/heapdef.h: Added parameter to hp_get_new_block() to be able to do thread specific memory tagging. storage/heap/hp_block.c: Added parameter to hp_get_new_block() to be able to do thread specific memory tagging. storage/heap/hp_create.c: - Internal HEAP tables are now marking it's memory as MY_THREAD_SPECIFIC. - Use MY_TREE_WITH_DELETE instead of removed option 'with_delete'. storage/heap/hp_open.c: Internal HEAP tables are now marking it's memory as MY_THREAD_SPECIFIC. storage/heap/hp_write.c: Added new parameter to hp_get_new_block() storage/maria/ma_bitmap.c: Updated call to my_init_dynamic_array() storage/maria/ma_blockrec.c: Updated call to my_init_dynamic_array() storage/maria/ma_check.c: Updated call to init_alloc_root() storage/maria/ma_ft_boolean_search.c: Updated calls to init_tree() and init_alloc_root() storage/maria/ma_ft_nlq_search.c: Updated call to init_tree() storage/maria/ma_ft_parser.c: Updated call to init_tree() Updated call to init_alloc_root() storage/maria/ma_loghandler.c: Updated call to my_init_dynamic_array() storage/maria/ma_open.c: Updated call to my_init_dynamic_array() storage/maria/ma_sort.c: Updated call to my_init_dynamic_array() storage/maria/ma_write.c: Updated calls to my_init_dynamic_array() and init_tree() storage/maria/maria_pack.c: Updated call to init_tree() storage/maria/unittest/sequence_storage.c: Updated call to my_init_dynamic_array() storage/myisam/ft_boolean_search.c: Updated call to init_tree() Updated call to init_alloc_root() storage/myisam/ft_nlq_search.c: Updated call to init_tree() storage/myisam/ft_parser.c: Updated call to init_tree() Updated call to init_alloc_root() storage/myisam/ft_stopwords.c: Updated call to init_tree() storage/myisam/mi_check.c: Updated call to init_alloc_root() storage/myisam/mi_write.c: Updated call to my_init_dynamic_array() Updated call to init_tree() storage/myisam/myisamlog.c: Updated call to init_tree() storage/myisam/myisampack.c: Updated call to init_tree() storage/myisam/sort.c: Updated call to my_init_dynamic_array() storage/myisammrg/ha_myisammrg.cc: Updated call to init_sql_alloc() storage/perfschema/pfs_check.cc: Rest current_thd storage/perfschema/pfs_instr.cc: Removed DBUG_ENTER/DBUG_VOID_RETURN as at this point my_thread_var is not allocated anymore, which can cause problems. support-files/compiler_warnings.supp: Disable compiler warning from offsetof macro. |
||
|
37465ea2fe |
Adding an Olivier's changeset:
pre_create function and one is now able to create table without giving the column specifications for tables of types: DBF, ODBC, MYSQL, CSV, and WMI (on Windows) modified: sql/handler.h sql/sql_table.cc storage/connect/ha_connect.cc storage/connect/ha_connect.h storage/connect/mycat.cc storage/connect/odbconn.cpp storage/connect/plgcnx.h storage/connect/tabfmt.cpp storage/connect/tabmysql.cpp storage/connect/tabwmi.cpp |
||
|
1ef07d0845 |
Merge 10.0-base -> 10.0.
Also fixed a bug in sql_update.cc: the code of mysql_update() lacked a call of set_statistics_for_table(). |
||
|
f853333e09 | Merge 5.5-mwl248 -> 10.0-base | ||
|
7d9df8075e | Merge 5.5 -> mwl248 | ||
|
544f413df9 | merge | ||
|
11b5693839 | merge | ||
|
6b7182d9a3 | Bug#14589559 Post push fix for valgrind warnings. |