Merge lp://staging/~hartmut-php/maria/5.5-bug30994 into lp://staging/~maria-captains/maria/trunk

.bzrignore (+0/-1)
BUILD-CMAKE (+7/-4)
CMakeLists.txt (+14/-9)
Docs/INSTALL-BINARY (+1/-1)
Docs/mysql.info (+4/-3)
INSTALL-SOURCE (+11/-0)
INSTALL-WIN-SOURCE (+2/-1)
KNOWN_BUGS.txt (+27/-27)
README (+4/-4)
VERSION (+1/-1)
client/get_password.c (+0/-4)
client/mysql.cc (+2/-1)
client/mysqlbinlog.cc (+34/-5)
client/mysqldump.c (+85/-19)
client/mysqltest.cc (+45/-15)
cmake/build_configurations/mysql_release.cmake (+13/-2)
cmake/cpack_rpm.cmake (+59/-17)
cmake/install_layout.cmake (+2/-4)
cmake/os/WindowsCache.cmake (+3/-0)
cmake/plugin.cmake (+1/-9)
cmake/readline.cmake (+2/-0)
config.h.cmake (+9/-0)
configure.cmake (+10/-3)
dbug/dbug.c (+0/-3)
dbug/factorial.c (+0/-14)
debian/additions/mariadb.cnf (+3/-3)
debian/additions/my.cnf (+1/-1)
debian/autobake-deb.sh (+8/-1)
debian/dist/Debian/control (+5/-4)
debian/dist/Debian/mariadb-server-5.5.postinst (+1/-1)
debian/dist/Debian/rules (+2/-21)
debian/dist/Ubuntu/control (+5/-4)
debian/dist/Ubuntu/mariadb-server-5.5.postinst (+1/-1)
debian/dist/Ubuntu/rules (+2/-21)
debian/mariadb-client-5.5.files (+1/-0)
extra/resolveip.c (+1/-3)
extra/yassl/taocrypt/src/asn.cpp (+4/-0)
extra/yassl/taocrypt/src/dsa.cpp (+1/-1)
include/atomic/nolock.h (+1/-1)
include/keycache.h (+2/-1)
include/lf.h (+1/-1)
include/m_string.h (+1/-5)
include/my_getopt.h (+2/-2)
include/my_global.h (+0/-28)
include/my_net.h (+1/-1)
include/my_pthread.h (+4/-64)
include/my_sys.h (+5/-0)
include/sql_common.h (+5/-4)
include/violite.h (+3/-3)
libmysql/get_password.c (+0/-4)
libmysql/libmysql.c (+5/-4)
libmysqld/examples/CMakeLists.txt (+2/-2)
man/CMakeLists.txt (+1/-1)
mysql-test/README (+3/-3)
mysql-test/include/icp_tests.inc (+18/-0)
mysql-test/include/index_merge2.inc (+1/-0)
mysql-test/include/mtr_check.sql (+1/-0)
mysql-test/include/mysqlbinlog_have_debug.inc (+34/-0)
mysql-test/include/query_cache_partitions.inc (+126/-0)
mysql-test/lib/mtr_cases.pm (+10/-5)
mysql-test/mysql-test-run.pl (+7/-16)
mysql-test/r/adddate_454.result (+10/-0)
mysql-test/r/auto_increment.result (+22/-0)
mysql-test/r/bug12427262.result (+56/-0)
mysql-test/r/case.result (+4/-0)
mysql-test/r/compare.result (+4/-0)
mysql-test/r/connect.result (+24/-0)
mysql-test/r/create-big.result (+2/-2)
mysql-test/r/ctype_binary.result (+4/-0)
mysql-test/r/ctype_cp1251.result (+4/-0)
mysql-test/r/ctype_latin1.result (+4/-0)
mysql-test/r/ctype_ucs.result (+4/-0)
mysql-test/r/ctype_utf32.result (+6/-0)
mysql-test/r/ctype_utf8.result (+4/-0)
mysql-test/r/datetime_456.result (+8/-0)
mysql-test/r/derived_opt.result (+12/-12)
mysql-test/r/derived_view.result (+4/-6)
mysql-test/r/errors.result (+8/-0)
mysql-test/r/explain.result (+3/-3)
mysql-test/r/features.result (+140/-0)
mysql-test/r/func_group.result (+3/-1)
mysql-test/r/func_group_innodb.result (+40/-13)
mysql-test/r/func_in.result (+23/-0)
mysql-test/r/func_test.result (+41/-0)
mysql-test/r/func_time.result (+2/-0)
mysql-test/r/gis-rt-precise.result (+13/-0)
mysql-test/r/gis-rtree.result (+14/-0)
mysql-test/r/gis.result (+23/-0)
mysql-test/r/group_min_max.result (+6/-6)
mysql-test/r/index_merge_innodb.result (+49/-2)
mysql-test/r/index_merge_myisam.result (+2/-2)
mysql-test/r/innodb_icp.result (+16/-0)
mysql-test/r/join_outer.result (+3/-3)
mysql-test/r/join_outer_jcl6.result (+3/-3)
mysql-test/r/key.result (+1/-1)
mysql-test/r/last_value.result (+73/-0)
mysql-test/r/mdev316.result (+22/-0)
mysql-test/r/mdev375.result (+14/-0)
mysql-test/r/myisam_icp.result (+36/-1)
mysql-test/r/myisam_mrr.result (+2/-2)
mysql-test/r/mysqlbinlog-innodb.result (+2/-2)
mysql-test/r/mysqlbinlog.result (+12/-12)
mysql-test/r/mysqlbinlog2.result (+35/-35)
mysql-test/r/mysqlbinlog_row.result (+1/-1)
mysql-test/r/mysqlbinlog_row_innodb.result (+4/-4)
mysql-test/r/mysqlbinlog_row_myisam.result (+4/-4)
mysql-test/r/mysqlbinlog_row_trans.result (+1/-1)
mysql-test/r/mysqld--help.result (+10/-2)
mysql-test/r/mysqldump.result (+68/-23)
mysql-test/r/mysqltest.result (+1/-0)
mysql-test/r/mysqltest_256.result (+1/-0)
mysql-test/r/negation_elimination.result (+2/-2)
mysql-test/r/order_by.result (+132/-0)
mysql-test/r/partition.result (+26/-0)
mysql-test/r/partition_cache.result (+9/-9)
mysql-test/r/partition_cache_innodb.result (+151/-0)
mysql-test/r/partition_cache_myisam.result (+153/-0)
mysql-test/r/partition_pruning.result (+3/-3)
mysql-test/r/ps.result (+75/-122)
mysql-test/r/read_only.result (+4/-6)
mysql-test/r/read_only_innodb.result (+9/-0)
mysql-test/r/rpl_mysqldump_slave.result (+1/-1)
mysql-test/r/sp.result (+37/-1)
mysql-test/r/subselect.result (+333/-47)
mysql-test/r/subselect2.result (+6/-6)
mysql-test/r/subselect3.result (+1/-1)
mysql-test/r/subselect3_jcl6.result (+1/-1)
mysql-test/r/subselect4.result (+314/-241)
mysql-test/r/subselect_cache.result (+4/-4)
mysql-test/r/subselect_extra_no_semijoin.result (+2/-2)
mysql-test/r/subselect_innodb.result (+17/-2)
mysql-test/r/subselect_mat.result (+22/-22)
mysql-test/r/subselect_mat_cost.result (+1/-1)
mysql-test/r/subselect_mat_cost_bugs.result (+4/-4)
mysql-test/r/subselect_no_mat.result (+337/-52)
mysql-test/r/subselect_no_opts.result (+337/-51)
mysql-test/r/subselect_no_scache.result (+332/-46)
mysql-test/r/subselect_no_semijoin.result (+332/-46)
mysql-test/r/subselect_partial_match.result (+3/-3)
mysql-test/r/subselect_sj.result (+14/-0)
mysql-test/r/subselect_sj_jcl6.result (+14/-0)
mysql-test/r/subselect_sj_mat.result (+9/-9)
mysql-test/r/type_blob.result (+4/-0)
mysql-test/r/type_date.result (+16/-10)
mysql-test/r/type_year.result (+17/-0)
mysql-test/r/union.result (+17/-0)
mysql-test/r/user_var-binlog.result (+1/-1)
mysql-test/r/user_var.result (+7/-0)
mysql-test/r/view.result (+58/-2)
mysql-test/suite/binlog/r/binlog_base64_flag.result (+1/-1)
mysql-test/suite/binlog/r/binlog_drop_if_exists.result (+18/-0)
mysql-test/suite/binlog/r/binlog_grant.result (+4/-0)
mysql-test/suite/binlog/r/binlog_mdev342.result (+30/-0)
mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result (+6/-6)
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result (+1/-1)
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result (+2/-2)
mysql-test/suite/binlog/t/binlog_drop_if_exists.test (+15/-0)
mysql-test/suite/binlog/t/binlog_grant.test (+19/-0)
mysql-test/suite/binlog/t/binlog_mdev342-master.opt (+1/-0)
mysql-test/suite/binlog/t/binlog_mdev342.test (+66/-0)
mysql-test/suite/engines/funcs/r/an_calendar.result (+6/-0)
mysql-test/suite/engines/funcs/r/datetime_function.result (+8/-0)
mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result (+5/-0)
mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result (+5/-0)
mysql-test/suite/engines/funcs/r/db_use_error.result (+1/-1)
mysql-test/suite/engines/funcs/r/de_calendar_range.result (+10/-2)
mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result (+30/-0)
mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result (+7/-0)
mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result (+4/-0)
mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result (+4/-0)
mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result (+7/-0)
mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result (+4/-0)
mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result (+6/-0)
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result (+29/-0)
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result (+16/-0)
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result (+16/-0)
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result (+29/-0)
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result (+16/-0)
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result (+24/-0)
mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_duplicate_update.result (+29/-0)
mysql-test/suite/engines/funcs/r/in_number_boundary_error.result (+6/-6)
mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result (+4/-4)
mysql-test/suite/engines/funcs/r/ld_all_number_string_calendar_types.result (+15224/-14552)
mysql-test/suite/engines/funcs/r/sq_all.result (+0/-12)
mysql-test/suite/engines/funcs/r/sq_error.result (+4/-4)
mysql-test/suite/engines/funcs/r/up_calendar_range.result (+13/-3)
mysql-test/suite/engines/funcs/t/se_join_left.test (+3767/-3137)
mysql-test/suite/engines/funcs/t/se_join_left_outer.test (+3347/-2927)
mysql-test/suite/engines/funcs/t/se_join_natural_left.test (+3347/-2927)
mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test (+3347/-2927)
mysql-test/suite/engines/iuds/r/delete_time.result (+2/-2)
mysql-test/suite/engines/iuds/r/delete_year.result (+6/-0)
mysql-test/suite/engines/iuds/r/insert_decimal.result (+1/-1)
mysql-test/suite/engines/iuds/r/insert_number.result (+48/-90)
mysql-test/suite/engines/iuds/r/insert_time.result (+55/-24)
mysql-test/suite/engines/iuds/r/insert_year.result (+12/-0)
mysql-test/suite/engines/iuds/r/type_bit_iuds.result (+88/-88)
mysql-test/suite/engines/iuds/r/update_delete_calendar.result (+19/-40)
mysql-test/suite/engines/iuds/r/update_delete_number.result (+10/-0)
mysql-test/suite/engines/iuds/r/update_time.result (+5/-5)
mysql-test/suite/engines/iuds/r/update_year.result (+6/-0)
mysql-test/suite/funcs_1/r/innodb_views.result (+4/-0)
mysql-test/suite/funcs_1/r/is_columns_innodb.result (+6/-0)
mysql-test/suite/funcs_1/r/is_columns_memory.result (+6/-0)
mysql-test/suite/funcs_1/r/is_columns_myisam.result (+6/-0)
mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result (+6/-0)
mysql-test/suite/funcs_1/r/memory_views.result (+4/-0)
mysql-test/suite/funcs_1/r/myisam_views-big.result (+4/-0)
mysql-test/suite/funcs_1/r/storedproc.result (+4/-0)
mysql-test/suite/heap/heap.result (+52/-0)
mysql-test/suite/heap/heap.test (+52/-0)
mysql-test/suite/heap/heap_hash.result (+19/-0)
mysql-test/suite/heap/heap_hash.test (+13/-0)
mysql-test/suite/innodb/r/innodb_bug12902967.result (+6/-0)
mysql-test/suite/innodb/r/innodb_bug14007649.result (+56/-0)
mysql-test/suite/innodb/r/innodb_bug52745.result (+1/-0)
mysql-test/suite/innodb/r/innodb_bug60196.result (+1/-1)
mysql-test/suite/innodb/t/innodb-blob.test (+0/-5)
mysql-test/suite/innodb/t/innodb-index.test (+0/-5)
mysql-test/suite/innodb/t/innodb-lock.test (+0/-5)
mysql-test/suite/innodb/t/innodb_bug12902967.test (+30/-0)
mysql-test/suite/innodb/t/innodb_bug13635833.test (+0/-5)
mysql-test/suite/innodb/t/innodb_bug14007649.test (+63/-0)
mysql-test/suite/maria/icp.result (+17/-1)
mysql-test/suite/maria/lock.result (+3/-0)
mysql-test/suite/maria/lock.test (+8/-0)
mysql-test/suite/maria/maria-gis-rtree-dynamic.result (+4/-0)
mysql-test/suite/maria/maria-gis-rtree-trans.result (+4/-0)
mysql-test/suite/maria/maria-gis-rtree.result (+4/-0)
mysql-test/suite/mtr2/combinations (+5/-0)
mysql-test/suite/percona/disabled.def (+2/-0)
mysql-test/suite/perfschema/disabled.def (+1/-1)
mysql-test/suite/perfschema/r/func_file_io.result (+12/-0)
mysql-test/suite/perfschema/r/query_cache.result (+6/-6)
mysql-test/suite/perfschema/t/func_file_io.test (+4/-0)
mysql-test/suite/perfschema/t/query_cache.test (+2/-2)
mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result (+41/-0)
mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result (+20/-0)
mysql-test/suite/rpl/r/rpl_hrtime.result (+1/-1)
mysql-test/suite/rpl/r/rpl_log_pos.result (+1/-1)
mysql-test/suite/rpl/r/rpl_mdev359.result (+13/-0)
mysql-test/suite/rpl/r/rpl_mdev382.result (+367/-0)
mysql-test/suite/rpl/r/rpl_packet.result (+6/-5)
mysql-test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result (+13/-0)
mysql-test/suite/rpl/r/rpl_report_port.result (+2/-2)
mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result (+4/-4)
mysql-test/suite/rpl/r/rpl_sp.result (+6/-6)
mysql-test/suite/rpl/r/rpl_start_slave_deadlock_sys_vars.result (+31/-0)
mysql-test/suite/rpl/r/rpl_trigger.result (+5/-5)
mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test (+62/-0)
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test (+61/-0)
mysql-test/suite/rpl/t/rpl_mdev359.test (+36/-0)
mysql-test/suite/rpl/t/rpl_mdev382.test (+265/-0)
mysql-test/suite/rpl/t/rpl_packet-slave.opt (+1/-1)
mysql-test/suite/rpl/t/rpl_packet.test (+7/-8)
mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test (+35/-0)
mysql-test/suite/rpl/t/rpl_report_port.test (+5/-3)
mysql-test/suite/rpl/t/rpl_start_slave_deadlock_sys_vars.test (+57/-0)
mysql-test/suite/rpl/t/rpl_start_stop_slave.test (+10/-0)
mysql-test/suite/rpl/t/rpl_trigger.test (+2/-5)
mysql-test/suite/sphinx/sphinx.result (+5/-2)
mysql-test/suite/sphinx/sphinx.test (+3/-1)
mysql-test/suite/storage_engine/1st.result (+11/-0)
mysql-test/suite/storage_engine/1st.test (+81/-0)
mysql-test/suite/storage_engine/alter_table.inc (+91/-0)
mysql-test/suite/storage_engine/alter_table.result (+147/-0)
mysql-test/suite/storage_engine/alter_table.test (+148/-0)
mysql-test/suite/storage_engine/alter_table_online.result (+35/-0)
mysql-test/suite/storage_engine/alter_table_online.test (+160/-0)
mysql-test/suite/storage_engine/alter_tablespace.result (+19/-0)
mysql-test/suite/storage_engine/alter_tablespace.test (+91/-0)
mysql-test/suite/storage_engine/analyze_table.inc (+43/-0)
mysql-test/suite/storage_engine/analyze_table.result (+29/-0)
mysql-test/suite/storage_engine/analyze_table.test (+14/-0)
mysql-test/suite/storage_engine/autoinc_secondary.result (+40/-0)
mysql-test/suite/storage_engine/autoinc_secondary.test (+73/-0)
mysql-test/suite/storage_engine/autoinc_vars.result (+55/-0)
mysql-test/suite/storage_engine/autoinc_vars.test (+68/-0)
mysql-test/suite/storage_engine/autoincrement.result (+133/-0)
mysql-test/suite/storage_engine/autoincrement.test (+114/-0)
mysql-test/suite/storage_engine/cache_index.result (+69/-0)
mysql-test/suite/storage_engine/cache_index.test (+142/-0)
mysql-test/suite/storage_engine/check_errors.inc (+80/-0)
mysql-test/suite/storage_engine/check_table.inc (+62/-0)
mysql-test/suite/storage_engine/check_table.result (+68/-0)
mysql-test/suite/storage_engine/check_table.test (+14/-0)
mysql-test/suite/storage_engine/checksum_table.inc (+31/-0)
mysql-test/suite/storage_engine/checksum_table.result (+20/-0)
mysql-test/suite/storage_engine/checksum_table.test (+11/-0)
mysql-test/suite/storage_engine/checksum_table_live.inc (+30/-0)
mysql-test/suite/storage_engine/checksum_table_live.result (+20/-0)
mysql-test/suite/storage_engine/checksum_table_live.test (+13/-0)
mysql-test/suite/storage_engine/cleanup_engine.inc (+11/-0)
mysql-test/suite/storage_engine/col_not_null.inc (+92/-0)
mysql-test/suite/storage_engine/col_null.inc (+65/-0)
mysql-test/suite/storage_engine/col_opt_default.result (+20/-0)
mysql-test/suite/storage_engine/col_opt_default.test (+49/-0)
mysql-test/suite/storage_engine/col_opt_not_null.result (+2062/-0)
mysql-test/suite/storage_engine/col_opt_not_null.test (+260/-0)
mysql-test/suite/storage_engine/col_opt_null.result (+1991/-0)
mysql-test/suite/storage_engine/col_opt_null.test (+208/-0)
mysql-test/suite/storage_engine/col_opt_unsigned.result (+697/-0)
mysql-test/suite/storage_engine/col_opt_unsigned.test (+95/-0)
mysql-test/suite/storage_engine/col_opt_zerofill.result (+679/-0)
mysql-test/suite/storage_engine/col_opt_zerofill.test (+88/-0)
mysql-test/suite/storage_engine/create_table.inc (+174/-0)
mysql-test/suite/storage_engine/create_table.result (+45/-0)
mysql-test/suite/storage_engine/create_table.test (+107/-0)
mysql-test/suite/storage_engine/define_engine.inc (+45/-0)
mysql-test/suite/storage_engine/delete.result (+77/-0)
mysql-test/suite/storage_engine/delete.test (+68/-0)
mysql-test/suite/storage_engine/delete_ignore.result (+59/-0)
mysql-test/suite/storage_engine/delete_ignore.test (+44/-0)
mysql-test/suite/storage_engine/delete_low_prio.result (+59/-0)
mysql-test/suite/storage_engine/delete_low_prio.test (+162/-0)
mysql-test/suite/storage_engine/delete_quick.result (+25/-0)
mysql-test/suite/storage_engine/delete_quick.test (+55/-0)
mysql-test/suite/storage_engine/delete_with_keys.result (+38/-0)
mysql-test/suite/storage_engine/delete_with_keys.test (+74/-0)
mysql-test/suite/storage_engine/describe.result (+18/-0)
mysql-test/suite/storage_engine/describe.test (+50/-0)
mysql-test/suite/storage_engine/foreign_keys.result (+71/-0)
mysql-test/suite/storage_engine/foreign_keys.test (+148/-0)
mysql-test/suite/storage_engine/fulltext_search.result (+132/-0)
mysql-test/suite/storage_engine/fulltext_search.test (+187/-0)
mysql-test/suite/storage_engine/handler.result (+77/-0)
mysql-test/suite/storage_engine/handler.test (+81/-0)
mysql-test/suite/storage_engine/have_default_index.inc (+20/-0)
mysql-test/suite/storage_engine/have_engine.inc (+127/-0)
mysql-test/suite/storage_engine/index.inc (+194/-0)
mysql-test/suite/storage_engine/index.result (+67/-0)
mysql-test/suite/storage_engine/index.test (+23/-0)
mysql-test/suite/storage_engine/index_enable_disable.result (+45/-0)
mysql-test/suite/storage_engine/index_enable_disable.test (+88/-0)
mysql-test/suite/storage_engine/index_key_block_size.result (+43/-0)
mysql-test/suite/storage_engine/index_key_block_size.test (+125/-0)
mysql-test/suite/storage_engine/index_primary.result (+53/-0)
mysql-test/suite/storage_engine/index_primary.test (+136/-0)
mysql-test/suite/storage_engine/index_type_btree.result (+67/-0)
mysql-test/suite/storage_engine/index_type_btree.test (+12/-0)
mysql-test/suite/storage_engine/index_type_hash.result (+67/-0)
mysql-test/suite/storage_engine/index_type_hash.test (+12/-0)
mysql-test/suite/storage_engine/insert.result (+149/-0)
mysql-test/suite/storage_engine/insert.test (+78/-0)
mysql-test/suite/storage_engine/insert_delayed.result (+25/-0)
mysql-test/suite/storage_engine/insert_delayed.test (+62/-0)
mysql-test/suite/storage_engine/insert_high_prio.result (+64/-0)
mysql-test/suite/storage_engine/insert_high_prio.test (+143/-0)
mysql-test/suite/storage_engine/insert_low_prio.result (+39/-0)
mysql-test/suite/storage_engine/insert_low_prio.test (+95/-0)
mysql-test/suite/storage_engine/insert_with_keys.result (+148/-0)
mysql-test/suite/storage_engine/insert_with_keys.test (+143/-0)
mysql-test/suite/storage_engine/loaddata.result (+68/-0)
mysql-test/suite/storage_engine/loaddata.test (+88/-0)
mysql-test/suite/storage_engine/lock.result (+111/-0)
mysql-test/suite/storage_engine/lock.test (+244/-0)
mysql-test/suite/storage_engine/lock_concurrent.result (+12/-0)
mysql-test/suite/storage_engine/lock_concurrent.test (+52/-0)
mysql-test/suite/storage_engine/mask_engine.inc (+14/-0)
mysql-test/suite/storage_engine/misc.result (+79/-0)
mysql-test/suite/storage_engine/misc.test (+47/-0)
mysql-test/suite/storage_engine/my.cnf (+7/-0)
mysql-test/suite/storage_engine/obfuscate.inc (+4/-0)
mysql-test/suite/storage_engine/optimize_table.inc (+42/-0)
mysql-test/suite/storage_engine/optimize_table.result (+29/-0)
mysql-test/suite/storage_engine/optimize_table.test (+14/-0)
mysql-test/suite/storage_engine/parts/alter_table.result (+42/-0)
mysql-test/suite/storage_engine/parts/alter_table.test (+107/-0)
mysql-test/suite/storage_engine/parts/analyze_table.result (+47/-0)
mysql-test/suite/storage_engine/parts/analyze_table.test (+61/-0)
mysql-test/suite/storage_engine/parts/check_table.result (+104/-0)
mysql-test/suite/storage_engine/parts/check_table.test (+82/-0)
mysql-test/suite/storage_engine/parts/checksum_table.result (+40/-0)
mysql-test/suite/storage_engine/parts/checksum_table.test (+13/-0)
mysql-test/suite/storage_engine/parts/create_table.result (+91/-0)
mysql-test/suite/storage_engine/parts/create_table.test (+179/-0)
mysql-test/suite/storage_engine/parts/my.cnf (+9/-0)
mysql-test/suite/storage_engine/parts/optimize_table.result (+54/-0)
mysql-test/suite/storage_engine/parts/optimize_table.test (+69/-0)
mysql-test/suite/storage_engine/parts/repair_table.result (+236/-0)
mysql-test/suite/storage_engine/parts/repair_table.test (+78/-0)
mysql-test/suite/storage_engine/parts/truncate_table.result (+68/-0)
mysql-test/suite/storage_engine/parts/truncate_table.test (+111/-0)
mysql-test/suite/storage_engine/repair_table.inc (+155/-0)
mysql-test/suite/storage_engine/repair_table.result (+106/-0)
mysql-test/suite/storage_engine/repair_table.test (+14/-0)
mysql-test/suite/storage_engine/replace.result (+47/-0)
mysql-test/suite/storage_engine/replace.test (+67/-0)
mysql-test/suite/storage_engine/se-innodb.out (+1/-0)
mysql-test/suite/storage_engine/select.result (+390/-0)
mysql-test/suite/storage_engine/select.test (+210/-0)
mysql-test/suite/storage_engine/select_high_prio.result (+45/-0)
mysql-test/suite/storage_engine/select_high_prio.test (+139/-0)
mysql-test/suite/storage_engine/show_engine.result (+11/-0)
mysql-test/suite/storage_engine/show_engine.test (+31/-0)
mysql-test/suite/storage_engine/show_table_status.result (+62/-0)
mysql-test/suite/storage_engine/show_table_status.test (+30/-0)
mysql-test/suite/storage_engine/strict_check_errors.inc (+23/-0)
mysql-test/suite/storage_engine/tbl_opt_ai.result (+14/-0)
mysql-test/suite/storage_engine/tbl_opt_ai.test (+35/-0)
mysql-test/suite/storage_engine/tbl_opt_avg_row_length.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_avg_row_length.test (+35/-0)
mysql-test/suite/storage_engine/tbl_opt_checksum.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_checksum.test (+30/-0)
mysql-test/suite/storage_engine/tbl_opt_connection.result (+24/-0)
mysql-test/suite/storage_engine/tbl_opt_connection.test (+52/-0)
mysql-test/suite/storage_engine/tbl_opt_data_index_dir.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_data_index_dir.test (+51/-0)
mysql-test/suite/storage_engine/tbl_opt_delay_key_write.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_delay_key_write.test (+35/-0)
mysql-test/suite/storage_engine/tbl_opt_insert_method.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_insert_method.test (+35/-0)
mysql-test/suite/storage_engine/tbl_opt_key_block_size.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_key_block_size.test (+35/-0)
mysql-test/suite/storage_engine/tbl_opt_max_rows.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_max_rows.test (+35/-0)
mysql-test/suite/storage_engine/tbl_opt_min_rows.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_min_rows.test (+35/-0)
mysql-test/suite/storage_engine/tbl_opt_pack_keys.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_pack_keys.test (+35/-0)
mysql-test/suite/storage_engine/tbl_opt_password.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_password.test (+40/-0)
mysql-test/suite/storage_engine/tbl_opt_row_format.result (+16/-0)
mysql-test/suite/storage_engine/tbl_opt_row_format.test (+35/-0)
mysql-test/suite/storage_engine/tbl_opt_union.result (+14/-0)
mysql-test/suite/storage_engine/tbl_opt_union.test (+41/-0)
mysql-test/suite/storage_engine/tbl_standard_opts.result (+40/-0)
mysql-test/suite/storage_engine/tbl_standard_opts.test (+60/-0)
mysql-test/suite/storage_engine/tbl_temporary.result (+11/-0)
mysql-test/suite/storage_engine/tbl_temporary.test (+32/-0)
mysql-test/suite/storage_engine/truncate_table.result (+41/-0)
mysql-test/suite/storage_engine/truncate_table.test (+81/-0)
mysql-test/suite/storage_engine/trx/cons_snapshot_repeatable_read.result (+18/-0)
mysql-test/suite/storage_engine/trx/cons_snapshot_repeatable_read.test (+9/-0)
mysql-test/suite/storage_engine/trx/cons_snapshot_serializable.result (+18/-0)
mysql-test/suite/storage_engine/trx/cons_snapshot_serializable.test (+9/-0)
mysql-test/suite/storage_engine/trx/consistent_snapshot.inc (+50/-0)
mysql-test/suite/storage_engine/trx/delete.result (+72/-0)
mysql-test/suite/storage_engine/trx/delete.test (+51/-0)
mysql-test/suite/storage_engine/trx/insert.result (+55/-0)
mysql-test/suite/storage_engine/trx/insert.test (+44/-0)
mysql-test/suite/storage_engine/trx/level_read_committed.result (+91/-0)
mysql-test/suite/storage_engine/trx/level_read_committed.test (+10/-0)
mysql-test/suite/storage_engine/trx/level_read_uncommitted.result (+116/-0)
mysql-test/suite/storage_engine/trx/level_read_uncommitted.test (+9/-0)
mysql-test/suite/storage_engine/trx/level_repeatable_read.result (+69/-0)
mysql-test/suite/storage_engine/trx/level_repeatable_read.test (+8/-0)
mysql-test/suite/storage_engine/trx/level_serializable.result (+56/-0)
mysql-test/suite/storage_engine/trx/level_serializable.test (+8/-0)
mysql-test/suite/storage_engine/trx/my.cnf (+7/-0)
mysql-test/suite/storage_engine/trx/select_for_update.result (+35/-0)
mysql-test/suite/storage_engine/trx/select_for_update.test (+87/-0)
mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.result (+37/-0)
mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.test (+82/-0)
mysql-test/suite/storage_engine/trx/support_savepoints.inc (+10/-0)
mysql-test/suite/storage_engine/trx/support_transactions.inc (+10/-0)
mysql-test/suite/storage_engine/trx/support_xa.inc (+12/-0)
mysql-test/suite/storage_engine/trx/transaction_isolation.inc (+99/-0)
mysql-test/suite/storage_engine/trx/update.result (+48/-0)
mysql-test/suite/storage_engine/trx/update.test (+50/-0)
mysql-test/suite/storage_engine/trx/xa.result (+96/-0)
mysql-test/suite/storage_engine/trx/xa.test (+118/-0)
mysql-test/suite/storage_engine/trx/xa_recovery.result (+29/-0)
mysql-test/suite/storage_engine/trx/xa_recovery.test (+71/-0)
mysql-test/suite/storage_engine/type_binary.inc (+52/-0)
mysql-test/suite/storage_engine/type_binary.result (+62/-0)
mysql-test/suite/storage_engine/type_binary.test (+10/-0)
mysql-test/suite/storage_engine/type_binary_indexes.result (+126/-0)
mysql-test/suite/storage_engine/type_binary_indexes.test (+149/-0)
mysql-test/suite/storage_engine/type_bit.inc (+76/-0)
mysql-test/suite/storage_engine/type_bit.result (+47/-0)
mysql-test/suite/storage_engine/type_bit.test (+10/-0)
mysql-test/suite/storage_engine/type_bit_indexes.result (+132/-0)
mysql-test/suite/storage_engine/type_bit_indexes.test (+175/-0)
mysql-test/suite/storage_engine/type_blob.inc (+65/-0)
mysql-test/suite/storage_engine/type_blob.result (+54/-0)
mysql-test/suite/storage_engine/type_blob.test (+10/-0)
mysql-test/suite/storage_engine/type_blob_indexes.result (+152/-0)
mysql-test/suite/storage_engine/type_blob_indexes.test (+188/-0)
mysql-test/suite/storage_engine/type_bool.inc (+81/-0)
mysql-test/suite/storage_engine/type_bool.result (+70/-0)
mysql-test/suite/storage_engine/type_bool.test (+10/-0)
mysql-test/suite/storage_engine/type_char.inc (+59/-0)
mysql-test/suite/storage_engine/type_char.result (+56/-0)
mysql-test/suite/storage_engine/type_char.test (+10/-0)
mysql-test/suite/storage_engine/type_char_indexes.result (+144/-0)
mysql-test/suite/storage_engine/type_char_indexes.test (+186/-0)
mysql-test/suite/storage_engine/type_date_time.inc (+55/-0)
mysql-test/suite/storage_engine/type_date_time.result (+48/-0)
mysql-test/suite/storage_engine/type_date_time.test (+11/-0)
mysql-test/suite/storage_engine/type_date_time_indexes.result (+278/-0)
mysql-test/suite/storage_engine/type_date_time_indexes.test (+366/-0)
mysql-test/suite/storage_engine/type_enum.inc (+69/-0)
mysql-test/suite/storage_engine/type_enum.result (+46/-0)
mysql-test/suite/storage_engine/type_enum.test (+10/-0)
mysql-test/suite/storage_engine/type_enum_indexes.result (+108/-0)
mysql-test/suite/storage_engine/type_enum_indexes.test (+146/-0)
mysql-test/suite/storage_engine/type_fixed.inc (+89/-0)
mysql-test/suite/storage_engine/type_fixed.result (+116/-0)
mysql-test/suite/storage_engine/type_fixed.test (+10/-0)
mysql-test/suite/storage_engine/type_fixed_indexes.result (+148/-0)
mysql-test/suite/storage_engine/type_fixed_indexes.test (+167/-0)
mysql-test/suite/storage_engine/type_float.inc (+111/-0)
mysql-test/suite/storage_engine/type_float.result (+286/-0)
mysql-test/suite/storage_engine/type_float.test (+10/-0)
mysql-test/suite/storage_engine/type_float_indexes.result (+146/-0)
mysql-test/suite/storage_engine/type_float_indexes.test (+203/-0)
mysql-test/suite/storage_engine/type_int.inc (+84/-0)
mysql-test/suite/storage_engine/type_int.result (+209/-0)
mysql-test/suite/storage_engine/type_int.test (+10/-0)
mysql-test/suite/storage_engine/type_int_indexes.result (+133/-0)
mysql-test/suite/storage_engine/type_int_indexes.test (+146/-0)
mysql-test/suite/storage_engine/type_set.inc (+69/-0)
mysql-test/suite/storage_engine/type_set.result (+48/-0)
mysql-test/suite/storage_engine/type_set.test (+10/-0)
mysql-test/suite/storage_engine/type_set_indexes.result (+137/-0)
mysql-test/suite/storage_engine/type_set_indexes.test (+167/-0)
mysql-test/suite/storage_engine/type_spatial.inc (+738/-0)
mysql-test/suite/storage_engine/type_spatial.result (+700/-0)
mysql-test/suite/storage_engine/type_spatial.test (+10/-0)
mysql-test/suite/storage_engine/type_spatial_indexes.result (+1400/-0)
mysql-test/suite/storage_engine/type_spatial_indexes.test (+15/-0)
mysql-test/suite/storage_engine/type_text.inc (+65/-0)
mysql-test/suite/storage_engine/type_text.result (+54/-0)
mysql-test/suite/storage_engine/type_text.test (+10/-0)
mysql-test/suite/storage_engine/type_text_indexes.result (+137/-0)
mysql-test/suite/storage_engine/type_text_indexes.test (+175/-0)
mysql-test/suite/storage_engine/type_varbinary.inc (+101/-0)
mysql-test/suite/storage_engine/type_varbinary.result (+92/-0)
mysql-test/suite/storage_engine/type_varbinary.test (+10/-0)
mysql-test/suite/storage_engine/type_varchar.inc (+100/-0)
mysql-test/suite/storage_engine/type_varchar.result (+127/-0)
mysql-test/suite/storage_engine/type_varchar.test (+10/-0)
mysql-test/suite/storage_engine/unexpected_result.inc (+50/-0)
mysql-test/suite/storage_engine/update.result (+50/-0)
mysql-test/suite/storage_engine/update.test (+43/-0)
mysql-test/suite/storage_engine/update_ignore.result (+54/-0)
mysql-test/suite/storage_engine/update_ignore.test (+43/-0)
mysql-test/suite/storage_engine/update_low_prio.result (+66/-0)
mysql-test/suite/storage_engine/update_low_prio.test (+167/-0)
mysql-test/suite/storage_engine/update_multi.result (+65/-0)
mysql-test/suite/storage_engine/update_multi.test (+44/-0)
mysql-test/suite/storage_engine/update_with_keys.result (+90/-0)
mysql-test/suite/storage_engine/update_with_keys.test (+152/-0)
mysql-test/suite/storage_engine/vcol.result (+69/-0)
mysql-test/suite/storage_engine/vcol.test (+72/-0)
mysql-test/suite/sys_vars/disabled.def (+1/-0)
mysql-test/suite/sys_vars/r/expensive_subquery_limit_basic.result (+52/-0)
mysql-test/suite/sys_vars/r/innodb_merge_sort_block_size_basic.result (+24/-0)
mysql-test/suite/sys_vars/r/slave_max_allowed_packet_basic.result (+147/-0)
mysql-test/suite/sys_vars/t/expensive_subquery_limit_basic.test (+38/-0)
mysql-test/suite/sys_vars/t/innodb_merge_sort_block_size_basic.test (+19/-0)
mysql-test/suite/sys_vars/t/innodb_trx_rseg_n_slots_debug_basic.test (+0/-5)
mysql-test/suite/sys_vars/t/slave_max_allowed_packet_basic.test (+177/-0)
mysql-test/suite/vcol/r/vcol_misc.result (+36/-0)
mysql-test/suite/vcol/t/vcol_misc.test (+23/-0)
mysql-test/t/adddate_454.test (+9/-0)
mysql-test/t/auto_increment.test (+16/-0)
mysql-test/t/bug12427262.test (+51/-0)
mysql-test/t/case.test (+11/-0)
mysql-test/t/compare.test (+8/-0)
mysql-test/t/connect.test (+30/-0)
mysql-test/t/create-big.test (+25/-6)
mysql-test/t/ctype_utf32.test (+5/-0)
mysql-test/t/datetime_456.test (+8/-0)
mysql-test/t/errors.test (+9/-0)
mysql-test/t/features.test (+107/-0)
mysql-test/t/func_group_innodb.test (+43/-14)
mysql-test/t/func_in.test (+29/-0)
mysql-test/t/func_test.test (+20/-0)
mysql-test/t/func_time.test (+2/-0)
mysql-test/t/gis.test (+15/-1)
mysql-test/t/index_merge_innodb.test (+48/-0)
mysql-test/t/last_value.test (+43/-0)
mysql-test/t/mdev316.test (+14/-0)
mysql-test/t/mdev375.test (+22/-0)
mysql-test/t/myisam_icp.test (+20/-0)
mysql-test/t/mysql_plugin.test (+2/-2)
mysql-test/t/mysqldump.test (+27/-0)
mysql-test/t/mysqltest.test (+5/-0)
mysql-test/t/mysqltest_256.test (+17/-0)
mysql-test/t/order_by.test (+39/-0)
mysql-test/t/partition.test (+23/-0)
mysql-test/t/partition_cache_innodb.test (+14/-0)
mysql-test/t/partition_cache_myisam.test (+14/-0)
mysql-test/t/ps.test (+70/-93)
mysql-test/t/read_only.test (+5/-9)
mysql-test/t/read_only_innodb.test (+23/-1)
mysql-test/t/select.test (+1/-0)
mysql-test/t/sp.test (+47/-1)
mysql-test/t/subselect.test (+229/-3)
mysql-test/t/subselect4.test (+58/-0)
mysql-test/t/subselect_innodb.test (+12/-0)
mysql-test/t/subselect_sj.test (+17/-0)
mysql-test/t/type_date.test (+10/-0)
mysql-test/t/type_year.test (+8/-0)
mysql-test/t/union.test (+20/-0)
mysql-test/t/user_var.test (+11/-0)
mysql-test/t/view.test (+47/-0)
mysys/charset-def.c (+1/-1)
mysys/default.c (+4/-0)
mysys/lf_alloc-pin.c (+1/-1)
mysys/lf_hash.c (+3/-1)
mysys/mf_iocache2.c (+56/-4)
mysys/mf_keycache.c (+204/-62)
mysys/my_chsize.c (+0/-7)
mysys/my_getopt.c (+17/-0)
mysys/my_lock.c (+1/-1)
mysys/my_pthread.c (+2/-67)
mysys/my_rename.c (+0/-16)
mysys/my_sync.c (+16/-2)
mysys/my_write.c (+5/-0)
mysys/thr_mutex.c (+0/-3)
mysys/waiting_threads.c (+2/-0)
plugin/auth_pam/auth_pam.c (+1/-1)
plugin/semisync/semisync.cc (+1/-1)
plugin/semisync/semisync.h (+1/-1)
plugin/semisync/semisync_master.cc (+5/-2)
plugin/semisync/semisync_master_plugin.cc (+2/-2)
plugin/semisync/semisync_slave_plugin.cc (+1/-1)
scripts/CMakeLists.txt (+2/-1)
scripts/fill_help_tables.sql (+2003/-1943)
scripts/mysql_install_db.sh (+5/-4)
scripts/mysqld_multi.sh (+1/-1)
sql-common/client.c (+19/-4)
sql-common/my_time.c (+80/-17)
sql/create_options.cc (+4/-1)
sql/derror.cc (+2/-2)
sql/event_scheduler.cc (+3/-2)
sql/field.cc (+17/-3)
sql/field.h (+9/-2)
sql/field_conv.cc (+3/-1)
sql/filesort.cc (+7/-5)
sql/ha_ndbcluster_binlog.cc (+17/-8)
sql/ha_partition.cc (+139/-2)
sql/ha_partition.h (+12/-14)
sql/handler.cc (+21/-7)
sql/handler.h (+42/-0)
sql/item.cc (+29/-5)
sql/item.h (+104/-16)
sql/item_cmpfunc.cc (+83/-13)
sql/item_cmpfunc.h (+5/-2)
sql/item_func.cc (+64/-2)
sql/item_func.h (+29/-1)
sql/item_geofunc.cc (+4/-2)
sql/item_row.cc (+1/-0)
sql/item_strfunc.cc (+1/-0)
sql/item_strfunc.h (+25/-1)
sql/item_subselect.cc (+139/-12)
sql/item_subselect.h (+9/-5)
sql/item_sum.cc (+3/-0)
sql/item_timefunc.cc (+17/-20)
sql/item_xmlfunc.cc (+2/-0)
sql/lex.h (+1/-0)
sql/log.cc (+66/-22)
sql/log.h (+12/-5)
sql/log_event.cc (+330/-222)
sql/log_event.h (+58/-24)
sql/log_event_old.cc (+2/-2)
sql/log_event_old.h (+1/-1)
sql/multi_range_read.cc (+1/-1)
sql/mysql_install_db.cc (+3/-3)
sql/mysqld.cc (+56/-27)
sql/mysqld.h (+2/-0)
sql/opt_range.cc (+68/-17)
sql/opt_range.h (+1/-1)
sql/opt_subselect.cc (+61/-12)
sql/opt_sum.cc (+1/-1)
sql/password.c (+1/-0)
sql/protocol.cc (+4/-2)
sql/repl_failsafe.cc (+0/-1)
sql/rpl_record.cc (+1/-1)
sql/rpl_rli.cc (+2/-2)
sql/rpl_rli.h (+35/-0)
sql/rpl_utility.cc (+67/-3)
sql/rpl_utility.h (+19/-1)
sql/share/CMakeLists.txt (+2/-2)
sql/share/errmsg-utf8.txt (+6/-0)
sql/signal_handler.cc (+0/-17)
sql/slave.cc (+16/-8)
sql/sp.cc (+1/-0)
sql/sp_head.cc (+1/-0)
sql/spatial.cc (+2/-2)
sql/spatial.h (+1/-1)
sql/sql_acl.cc (+1/-0)
sql/sql_admin.cc (+1/-0)
sql/sql_base.cc (+58/-32)
sql/sql_cache.cc (+39/-58)
sql/sql_cache.h (+19/-12)
sql/sql_class.cc (+144/-8)
sql/sql_class.h (+23/-15)
sql/sql_cursor.cc (+2/-0)
sql/sql_db.cc (+12/-29)
sql/sql_delete.cc (+8/-2)
sql/sql_insert.cc (+0/-4)
sql/sql_join_cache.cc (+4/-3)
sql/sql_lex.cc (+87/-4)
sql/sql_lex.h (+8/-6)
sql/sql_load.cc (+34/-56)
sql/sql_parse.cc (+9/-2)
sql/sql_partition.cc (+5/-3)
sql/sql_plugin.cc (+1/-1)
sql/sql_plugin.h (+3/-3)
sql/sql_profile.cc (+4/-4)
sql/sql_profile.h (+1/-1)
sql/sql_repl.cc (+9/-5)
sql/sql_select.cc (+223/-121)
sql/sql_select.h (+17/-1)
sql/sql_show.cc (+21/-13)
sql/sql_show.h (+1/-1)
sql/sql_string.cc (+18/-10)
sql/sql_string.h (+1/-0)
sql/sql_table.cc (+187/-44)
sql/sql_time.cc (+36/-43)
sql/sql_time.h (+1/-1)
sql/sql_trigger.cc (+3/-0)
sql/sql_truncate.cc (+23/-18)
sql/sql_union.cc (+2/-0)
sql/sql_update.cc (+2/-2)
sql/sql_yacc.yy (+34/-7)
sql/sys_vars.cc (+76/-38)
sql/sys_vars.h (+3/-1)
sql/table.cc (+52/-9)
sql/table.h (+3/-0)
sql/tztime.cc (+3/-1)
sql/unireg.cc (+14/-9)
sql/unireg.h (+0/-6)
storage/archive/azio.c (+17/-10)
storage/archive/ha_archive.cc (+21/-6)
storage/blackhole/ha_blackhole.cc (+1/-1)
storage/example/mysql-test/mtr/suite.pm (+8/-0)
storage/heap/hp_block.c (+12/-11)
storage/heap/hp_create.c (+17/-6)
storage/heap/hp_hash.c (+9/-0)
storage/innobase/btr/btr0btr.c (+4/-0)
storage/innobase/btr/btr0cur.c (+2/-0)
storage/innobase/buf/buf0buf.c (+7/-4)
storage/innobase/buf/buf0flu.c (+0/-9)
storage/innobase/buf/buf0lru.c (+14/-0)
storage/innobase/buf/buf0rea.c (+47/-1)
storage/innobase/dict/dict0dict.c (+34/-2)
storage/innobase/dict/dict0load.c (+2/-2)
storage/innobase/dict/dict0mem.c (+3/-1)
storage/innobase/fil/fil0fil.c (+3/-1)
storage/innobase/ha/ha0ha.c (+1/-15)
storage/innobase/handler/ha_innodb.cc (+56/-19)
storage/innobase/handler/ha_innodb.h (+1/-0)
storage/innobase/handler/handler0alter.cc (+11/-7)
storage/innobase/include/btr0btr.h (+3/-0)
storage/innobase/include/btr0types.h (+4/-0)
storage/innobase/include/buf0buf.h (+11/-10)
storage/innobase/include/buf0buf.ic (+2/-0)
storage/innobase/include/dict0dict.h (+4/-1)
storage/innobase/include/dict0dict.ic (+2/-0)
storage/innobase/include/log0log.h (+1/-1)
storage/innobase/include/os0file.h (+1/-1)
storage/innobase/include/srv0srv.h (+2/-1)
storage/innobase/include/trx0sys.h (+1/-3)
storage/innobase/log/log0recv.c (+1/-1)
storage/innobase/mem/mem0dbg.c (+3/-1)
storage/innobase/mysql-test/storage_engine/alter_tablespace.opt (+2/-0)
storage/innobase/mysql-test/storage_engine/autoinc_secondary.rdiff (+30/-0)
storage/innobase/mysql-test/storage_engine/cache_index.rdiff (+71/-0)
storage/innobase/mysql-test/storage_engine/checksum_table_live.rdiff (+13/-0)
storage/innobase/mysql-test/storage_engine/define_engine.inc (+45/-0)
storage/innobase/mysql-test/storage_engine/disabled.def (+9/-0)
storage/innobase/mysql-test/storage_engine/fulltext_search.rdiff (+150/-0)
storage/innobase/mysql-test/storage_engine/index_enable_disable.rdiff (+33/-0)
storage/innobase/mysql-test/storage_engine/index_type_hash.rdiff (+60/-0)
storage/innobase/mysql-test/storage_engine/insert_delayed.rdiff (+26/-0)
storage/innobase/mysql-test/storage_engine/lock_concurrent.rdiff (+22/-0)
storage/innobase/mysql-test/storage_engine/optimize_table.rdiff (+37/-0)
storage/innobase/mysql-test/storage_engine/parts/checksum_table.rdiff (+22/-0)
storage/innobase/mysql-test/storage_engine/parts/create_table.rdiff (+20/-0)
storage/innobase/mysql-test/storage_engine/parts/optimize_table.rdiff (+58/-0)
storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff (+228/-0)
storage/innobase/mysql-test/storage_engine/parts/suite.opt (+4/-0)
storage/innobase/mysql-test/storage_engine/repair_table.rdiff (+129/-0)
storage/innobase/mysql-test/storage_engine/suite.opt (+4/-0)
storage/innobase/mysql-test/storage_engine/tbl_opt_data_index_dir.rdiff (+18/-0)
storage/innobase/mysql-test/storage_engine/tbl_opt_insert_method.rdiff (+11/-0)
storage/innobase/mysql-test/storage_engine/tbl_opt_key_block_size.opt (+3/-0)
storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.opt (+3/-0)
storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff (+10/-0)
storage/innobase/mysql-test/storage_engine/tbl_opt_union.rdiff (+16/-0)
storage/innobase/mysql-test/storage_engine/trx/disabled.def (+2/-0)
storage/innobase/mysql-test/storage_engine/trx/suite.opt (+5/-0)
storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff (+20/-0)
storage/innobase/mysql-test/storage_engine/type_float_indexes.rdiff (+11/-0)
storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff (+712/-0)
storage/innobase/mysql-test/storage_engine/vcol.rdiff (+82/-0)
storage/innobase/os/os0file.c (+19/-6)
storage/innobase/os/os0thread.c (+4/-2)
storage/innobase/page/page0zip.c (+2/-0)
storage/innobase/row/row0ins.c (+2/-4)
storage/innobase/row/row0vers.c (+0/-11)
storage/innobase/srv/srv0start.c (+12/-4)
storage/innobase/sync/sync0arr.c (+5/-0)
storage/innobase/trx/trx0sys.c (+1/-1)
storage/innobase/ut/ut0dbg.c (+4/-2)
storage/innobase/ut/ut0ut.c (+8/-0)
storage/maria/ha_maria.cc (+23/-1)
storage/maria/ha_maria.h (+1/-6)
storage/maria/ma_blockrec.c (+2/-0)
storage/maria/ma_close.c (+19/-12)
storage/maria/ma_delete.c (+2/-0)
storage/maria/ma_delete_table.c (+4/-8)
storage/maria/ma_ft_nlq_search.c (+2/-0)
storage/maria/ma_info.c (+1/-0)
storage/maria/ma_key_recover.c (+6/-1)
storage/maria/ma_open.c (+4/-0)
storage/maria/ma_pagecache.c (+1/-0)
storage/maria/ma_rt_index.c (+22/-4)
storage/maria/ma_search.c (+4/-0)
storage/maria/ma_write.c (+2/-0)
storage/maria/maria_chk.c (+0/-3)
storage/myisam/ft_boolean_search.c (+14/-2)
storage/myisam/ft_nlq_search.c (+18/-1)
storage/myisam/ha_myisam.cc (+22/-0)
storage/myisam/ha_myisam.h (+1/-6)
storage/myisam/mi_extra.c (+0/-2)
storage/myisam/mi_keycache.c (+2/-0)
storage/myisam/myisamchk.c (+0/-3)
storage/myisam/mysql-test/mtr2/suite.pm (+9/-0)
storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff (+32/-0)
storage/myisam/mysql-test/storage_engine/check_table.rdiff (+20/-0)
storage/myisam/mysql-test/storage_engine/define_engine.inc (+45/-0)
storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff (+145/-0)
storage/myisam/mysql-test/storage_engine/index_type_hash.rdiff (+60/-0)
storage/myisam/mysql-test/storage_engine/show_engine.rdiff (+10/-0)
storage/myisam/mysql-test/storage_engine/tbl_opt_insert_method.rdiff (+11/-0)
storage/myisam/mysql-test/storage_engine/tbl_opt_union.rdiff (+16/-0)
storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff (+9/-0)
storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff (+9/-0)
storage/myisam/mysql-test/storage_engine/trx/delete.rdiff (+50/-0)
storage/myisam/mysql-test/storage_engine/trx/insert.rdiff (+65/-0)
storage/myisam/mysql-test/storage_engine/trx/level_read_committed.rdiff (+44/-0)
storage/myisam/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff (+7/-0)
storage/myisam/mysql-test/storage_engine/trx/level_repeatable_read.rdiff (+53/-0)
storage/myisam/mysql-test/storage_engine/trx/level_serializable.rdiff (+69/-0)
storage/myisam/mysql-test/storage_engine/trx/select_for_update.rdiff (+50/-0)
storage/myisam/mysql-test/storage_engine/trx/select_lock_in_share_mode.rdiff (+37/-0)
storage/myisam/mysql-test/storage_engine/trx/update.rdiff (+58/-0)
storage/myisam/mysql-test/storage_engine/trx/xa.rdiff (+89/-0)
storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff (+33/-0)
storage/myisam/rt_index.c (+23/-4)
storage/myisammrg/ha_myisammrg.cc (+41/-0)
storage/myisammrg/ha_myisammrg.h (+6/-0)
storage/myisammrg/mysql-test/storage_engine/alter_table.inc (+116/-0)
storage/myisammrg/mysql-test/storage_engine/alter_table.rdiff (+68/-0)
storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff (+27/-0)
storage/myisammrg/mysql-test/storage_engine/analyze_table.rdiff (+22/-0)
storage/myisammrg/mysql-test/storage_engine/autoincrement.rdiff (+34/-0)
storage/myisammrg/mysql-test/storage_engine/cache_index.rdiff (+46/-0)
storage/myisammrg/mysql-test/storage_engine/checksum_table_live.rdiff (+6/-0)
storage/myisammrg/mysql-test/storage_engine/cleanup_engine.inc (+16/-0)
storage/myisammrg/mysql-test/storage_engine/create_table.inc (+208/-0)
storage/myisammrg/mysql-test/storage_engine/create_table.rdiff (+37/-0)
storage/myisammrg/mysql-test/storage_engine/define_engine.inc (+49/-0)
storage/myisammrg/mysql-test/storage_engine/disabled.def (+2/-0)
storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff (+138/-0)
storage/myisammrg/mysql-test/storage_engine/fulltext_search.rdiff (+142/-0)
storage/myisammrg/mysql-test/storage_engine/handler.rdiff (+79/-0)
storage/myisammrg/mysql-test/storage_engine/index.rdiff (+6/-0)
storage/myisammrg/mysql-test/storage_engine/index_enable_disable.rdiff (+17/-0)
storage/myisammrg/mysql-test/storage_engine/index_type_btree.rdiff (+6/-0)
storage/myisammrg/mysql-test/storage_engine/index_type_hash.rdiff (+34/-0)
storage/myisammrg/mysql-test/storage_engine/insert_delayed.rdiff (+14/-0)
storage/myisammrg/mysql-test/storage_engine/lock.rdiff (+62/-0)
storage/myisammrg/mysql-test/storage_engine/optimize_table.rdiff (+24/-0)
storage/myisammrg/mysql-test/storage_engine/parts/alter_table.rdiff (+63/-0)
storage/myisammrg/mysql-test/storage_engine/parts/analyze_table.rdiff (+83/-0)
storage/myisammrg/mysql-test/storage_engine/parts/check_table.rdiff (+172/-0)
storage/myisammrg/mysql-test/storage_engine/parts/checksum_table.rdiff (+81/-0)
storage/myisammrg/mysql-test/storage_engine/parts/create_table.rdiff (+156/-0)
storage/myisammrg/mysql-test/storage_engine/parts/optimize_table.rdiff (+91/-0)
storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff (+295/-0)
storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff (+100/-0)
storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff (+103/-0)
storage/myisammrg/mysql-test/storage_engine/show_engine.rdiff (+2/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_ai.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_avg_row_length.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_checksum.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_connection.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_data_index_dir.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_delay_key_write.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_insert_method.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_key_block_size.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_max_rows.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_min_rows.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_pack_keys.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_password.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_row_format.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_opt_union.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_standard_opts.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/tbl_temporary.rdiff (+4/-0)
storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff (+35/-0)
storage/myisammrg/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff (+9/-0)
storage/myisammrg/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff (+9/-0)
storage/myisammrg/mysql-test/storage_engine/trx/delete.rdiff (+34/-0)
storage/myisammrg/mysql-test/storage_engine/trx/insert.rdiff (+32/-0)
storage/myisammrg/mysql-test/storage_engine/trx/level_read_committed.rdiff (+44/-0)
storage/myisammrg/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff (+7/-0)
storage/myisammrg/mysql-test/storage_engine/trx/level_repeatable_read.rdiff (+53/-0)
storage/myisammrg/mysql-test/storage_engine/trx/level_serializable.rdiff (+69/-0)
storage/myisammrg/mysql-test/storage_engine/trx/select_for_update.rdiff (+40/-0)
storage/myisammrg/mysql-test/storage_engine/trx/select_lock_in_share_mode.rdiff (+26/-0)
storage/myisammrg/mysql-test/storage_engine/trx/update.rdiff (+41/-0)
storage/myisammrg/mysql-test/storage_engine/trx/xa.rdiff (+34/-0)
storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff (+22/-0)
storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff (+8/-0)
storage/myisammrg/mysql-test/storage_engine/type_float_indexes.rdiff (+4/-0)
storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff (+706/-0)
storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff (+1412/-0)
storage/myisammrg/mysql-test/storage_engine/vcol.rdiff (+79/-0)
storage/oqgraph/CMakeLists.txt (+16/-6)
storage/xtradb/btr/btr0btr.c (+233/-100)
storage/xtradb/btr/btr0cur.c (+185/-83)
storage/xtradb/btr/btr0pcur.c (+67/-28)
storage/xtradb/btr/btr0sea.c (+5/-3)
storage/xtradb/buf/buf0buf.c (+51/-41)
storage/xtradb/buf/buf0flu.c (+2/-26)
storage/xtradb/buf/buf0lru.c (+417/-113)
storage/xtradb/buf/buf0rea.c (+46/-1)
storage/xtradb/dict/dict0boot.c (+165/-56)
storage/xtradb/dict/dict0dict.c (+70/-22)
storage/xtradb/dict/dict0load.c (+22/-24)
storage/xtradb/dict/dict0mem.c (+3/-1)
storage/xtradb/fil/fil0fil.c (+74/-43)
storage/xtradb/fsp/fsp0fsp.c (+240/-177)
storage/xtradb/ha/ha0ha.c (+1/-15)
storage/xtradb/handler/ha_innodb.cc (+338/-96)
storage/xtradb/handler/ha_innodb.h (+8/-6)
storage/xtradb/handler/handler0alter.cc (+28/-11)
storage/xtradb/handler/i_s.cc (+312/-0)
storage/xtradb/handler/i_s.h (+2/-0)
storage/xtradb/ibuf/ibuf0ibuf.c (+84/-46)
storage/xtradb/include/btr0btr.h (+49/-12)
storage/xtradb/include/btr0btr.ic (+1/-1)
storage/xtradb/include/btr0cur.h (+44/-44)
storage/xtradb/include/btr0cur.ic (+25/-4)
storage/xtradb/include/btr0pcur.h (+10/-0)
storage/xtradb/include/btr0types.h (+4/-0)
storage/xtradb/include/buf0buf.h (+49/-10)
storage/xtradb/include/buf0buf.ic (+6/-17)
storage/xtradb/include/buf0lru.h (+5/-6)
storage/xtradb/include/buf0types.h (+9/-0)
storage/xtradb/include/data0data.h (+22/-1)
storage/xtradb/include/data0data.ic (+43/-12)
storage/xtradb/include/db0err.h (+5/-3)
storage/xtradb/include/dict0boot.h (+20/-0)
storage/xtradb/include/dict0dict.h (+7/-12)
storage/xtradb/include/dict0dict.ic (+5/-18)
storage/xtradb/include/dict0mem.h (+6/-4)
storage/xtradb/include/fil0fil.h (+10/-9)
storage/xtradb/include/fsp0fsp.h (+24/-16)
storage/xtradb/include/ha_prototypes.h (+11/-0)
storage/xtradb/include/log0log.h (+4/-4)
storage/xtradb/include/mem0mem.ic (+0/-4)
storage/xtradb/include/mtr0log.ic (+2/-1)
storage/xtradb/include/mtr0mtr.h (+9/-4)
storage/xtradb/include/mtr0mtr.ic (+6/-5)
storage/xtradb/include/os0file.h (+1/-1)
storage/xtradb/include/page0page.h (+36/-9)
storage/xtradb/include/page0page.ic (+34/-4)
storage/xtradb/include/row0mysql.h (+5/-3)
storage/xtradb/include/row0sel.h (+6/-1)
storage/xtradb/include/srv0srv.h (+12/-9)
storage/xtradb/include/sync0rw.h (+18/-0)
storage/xtradb/include/sync0rw.ic (+2/-6)
storage/xtradb/include/sync0sync.h (+6/-4)
storage/xtradb/include/trx0purge.h (+2/-2)
storage/xtradb/include/trx0rec.ic (+4/-3)
storage/xtradb/include/trx0rseg.ic (+8/-1)
storage/xtradb/include/trx0sys.h (+7/-3)
storage/xtradb/include/trx0undo.h (+7/-6)
storage/xtradb/include/univ.i (+12/-23)
storage/xtradb/include/ut0mem.h (+6/-27)
storage/xtradb/include/ut0rnd.ic (+1/-1)
storage/xtradb/lock/lock0lock.c (+91/-54)
storage/xtradb/log/log0log.c (+128/-51)
storage/xtradb/log/log0recv.c (+1/-1)
storage/xtradb/mem/mem0dbg.c (+3/-1)
storage/xtradb/mem/mem0pool.c (+1/-5)
storage/xtradb/mtr/mtr0mtr.c (+3/-3)
storage/xtradb/os/os0file.c (+117/-7)
storage/xtradb/os/os0proc.c (+0/-3)
storage/xtradb/os/os0thread.c (+4/-2)
storage/xtradb/page/page0cur.c (+15/-8)
storage/xtradb/page/page0page.c (+39/-38)
storage/xtradb/page/page0zip.c (+2/-0)
storage/xtradb/pars/pars0pars.c (+1/-1)
storage/xtradb/row/row0ins.c (+84/-12)
storage/xtradb/row/row0merge.c (+209/-108)
storage/xtradb/row/row0mysql.c (+130/-30)
storage/xtradb/row/row0row.c (+15/-10)
storage/xtradb/row/row0sel.c (+22/-15)
storage/xtradb/row/row0umod.c (+2/-1)
storage/xtradb/row/row0upd.c (+53/-14)
storage/xtradb/row/row0vers.c (+0/-11)
storage/xtradb/srv/srv0srv.c (+83/-30)
storage/xtradb/srv/srv0start.c (+22/-6)
storage/xtradb/sync/sync0arr.c (+5/-0)
storage/xtradb/sync/sync0rw.c (+6/-4)
storage/xtradb/sync/sync0sync.c (+11/-5)
storage/xtradb/trx/trx0purge.c (+3/-2)
storage/xtradb/trx/trx0rec.c (+24/-18)
storage/xtradb/trx/trx0sys.c (+30/-32)
storage/xtradb/trx/trx0trx.c (+2/-0)
storage/xtradb/trx/trx0undo.c (+21/-22)
storage/xtradb/ut/ut0dbg.c (+4/-2)
storage/xtradb/ut/ut0mem.c (+1/-81)
storage/xtradb/ut/ut0ut.c (+13/-3)
strings/ctype-ucs2.c (+7/-2)
strings/my_vsnprintf.c (+47/-2)
support-files/CMakeLists.txt (+10/-0)
support-files/compiler_warnings.supp (+1/-0)
support-files/my-huge.cnf.sh (+1/-1)
support-files/mysql.spec.sh (+1/-1)
support-files/rpm/client.cnf (+13/-0)
support-files/rpm/my.cnf (+11/-0)
support-files/rpm/mysql-clients.cnf (+23/-0)
support-files/rpm/server-postin.sh (+4/-12)
support-files/rpm/server-postun.sh (+7/-0)
support-files/rpm/server-prein.sh (+0/-7)
support-files/rpm/server-preun.sh (+4/-4)
support-files/rpm/server.cnf (+28/-0)
tests/mysql_client_fw.c (+1440/-0)
tests/mysql_client_test.c (+56/-1426)
unittest/mysys/ma_dyncol-t.c (+1/-1)
unittest/strings/strings-t.c (+1/-1)
vio/viosocket.c (+1/-1)
vio/viosslfactories.c (+7/-6)
win/packaging/CPackWixConfig.cmake (+2/-1)
win/packaging/ca/CMakeLists.txt (+1/-1)