maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  <Dao-Gang.Qu@xxxxxxx>
  <Li-Bing.Song@xxxxxxx>
  Alexander Barkov <bar@xxxxxxxxx>
  Alexander Nozdrin <alik@xxxxxxx>
  Alexey Botchkov <holyfoot@xxxxxxxxx>...

------------------------------------------------------------
revno: 2771 [merge]
committer: knielsen@xxxxxxxxxxxxxxx
branch nick: work-5.1
timestamp: Mon 2009-11-30 22:37:27 +0100
message:
  Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
  Also merge charset patch.
removed:
  mysql-test/include/have_dynamic_loading.inc
  mysys/mf_strip.c
  storage/innodb_plugin/README
  storage/innodb_plugin/handler/handler0vars.h
  storage/innodb_plugin/handler/win_delay_loader.cc
  storage/innodb_plugin/win-plugin/
  storage/innodb_plugin/win-plugin/README
  storage/innodb_plugin/win-plugin/win-plugin.diff
added:
  mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test
  mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test
  mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test
  mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test
  mysql-test/include/have_case_insensitive_fs.inc
  mysql-test/include/have_debug_sync.inc
  mysql-test/include/have_dynamic_loading.inc
  mysql-test/include/have_mysql_upgrade.inc
  mysql-test/include/have_not_innodb_plugin.inc
  mysql-test/include/not_windows_embedded.inc
  mysql-test/lib/v1/incompatible.tests
  mysql-test/r/bug46760.result
  mysql-test/r/case_insensitive_fs.require
  mysql-test/r/debug_sync.result
  mysql-test/r/grant_lowercase_fs.result
  mysql-test/r/have_debug_sync.require
  mysql-test/r/innodb_bug44369.result
  mysql-test/r/innodb_bug46000.result
  mysql-test/r/innodb_bug47777.result
  mysql-test/r/locale.result
  mysql-test/r/lowercase_mixed_tmpdir_innodb.result
  mysql-test/r/not_true.require
  mysql-test/r/partition_innodb_builtin.result
  mysql-test/r/partition_innodb_plugin.result
  mysql-test/r/partition_open_files_limit.result
  mysql-test/r/sp-bugs.result
  mysql-test/r/subselect4.result
  mysql-test/std_data/binlog_transaction.000001
  mysql-test/std_data/latin1.xml
  mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
  mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
  mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result
  mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result
  mysql-test/suite/binlog/r/binlog_stm_do_db.result
  mysql-test/suite/binlog/std_data/update-full-row.binlog
  mysql-test/suite/binlog/std_data/update-partial-row.binlog
  mysql-test/suite/binlog/std_data/write-full-row.binlog
  mysql-test/suite/binlog/std_data/write-partial-row.binlog
  mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
  mysql-test/suite/binlog/t/binlog_mixed_failure_mixing_engines.test
  mysql-test/suite/binlog/t/binlog_row_failure_mixing_engines.test
  mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test
  mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
  mysql-test/suite/binlog/t/binlog_stm_do_db.test
  mysql-test/suite/federated/federated_debug-master.opt
  mysql-test/suite/federated/federated_debug.result
  mysql-test/suite/federated/federated_debug.test
  mysql-test/suite/innodb/r/innodb-consistent.result
  mysql-test/suite/innodb/r/innodb_bug44571.result
  mysql-test/suite/innodb/t/innodb-consistent-master.opt
  mysql-test/suite/innodb/t/innodb-consistent.test
  mysql-test/suite/innodb/t/innodb_bug44571.test
  mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
  mysql-test/suite/rpl/r/rpl_mysql_upgrade.result
  mysql-test/suite/rpl/r/rpl_row_disabled_slave_key.result
  mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
  mysql-test/suite/rpl/t/rpl_get_master_version_and_clock-slave.opt
  mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
  mysql-test/suite/rpl/t/rpl_row_disabled_slave_key.test
  mysql-test/t/bug46760-master.opt
  mysql-test/t/bug46760.test
  mysql-test/t/debug_sync.test
  mysql-test/t/grant_lowercase_fs.test
  mysql-test/t/innodb_bug44369.test
  mysql-test/t/innodb_bug46000.test
  mysql-test/t/innodb_bug47777.test
  mysql-test/t/locale.test
  mysql-test/t/lowercase_mixed_tmpdir_innodb-master.opt
  mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh
  mysql-test/t/lowercase_mixed_tmpdir_innodb.test
  mysql-test/t/partition_innodb_builtin.test
  mysql-test/t/partition_innodb_plugin.test
  mysql-test/t/partition_open_files_limit-master.opt
  mysql-test/t/partition_open_files_limit.test
  mysql-test/t/sp-bugs.test
  mysql-test/t/status-master.opt
  mysql-test/t/subselect4.test
  sql/debug_sync.cc
  sql/debug_sync.h
  storage/innodb_plugin/mysql-test/innodb-consistent-master.opt
  storage/innodb_plugin/mysql-test/innodb-consistent.result
  storage/innodb_plugin/mysql-test/innodb-consistent.test
  storage/innodb_plugin/mysql-test/innodb_bug44369.result
  storage/innodb_plugin/mysql-test/innodb_bug44369.test
  storage/innodb_plugin/mysql-test/innodb_bug44571.result
  storage/innodb_plugin/mysql-test/innodb_bug44571.test
  storage/innodb_plugin/mysql-test/innodb_bug46000.result
  storage/innodb_plugin/mysql-test/innodb_bug46000.test
  storage/innodb_plugin/revert_gen.sh
  storage/innodb_plugin/scripts/export.sh
  storage/innodb_plugin/ut/ut0auxconf_have_gcc_atomics.c
renamed:
  mysql-test/r/bug40113.result => mysql-test/r/innodb_lock_wait_timeout_1.result
  mysql-test/t/bug40113-master.opt => mysql-test/t/innodb_lock_wait_timeout_1-master.opt
  mysql-test/t/bug40113.test => mysql-test/t/innodb_lock_wait_timeout_1.test
modified:
  .bzrignore
  CMakeLists.txt
  Makefile.am
  client/mysql.cc
  client/mysql_upgrade.c
  client/mysqlbinlog.cc
  client/mysqlcheck.c
  client/mysqlimport.c
  client/mysqlslap.c
  client/mysqltest.cc
  cmd-line-utils/readline/config_readline.h
  cmd-line-utils/readline/display.c
  configure.in
  extra/yassl/include/yassl_int.hpp
  extra/yassl/taocrypt/src/random.cpp
  include/m_ctype.h
  include/my_dbug.h
  include/my_sys.h
  include/myisamchk.h
  include/mysql.h
  include/mysql.h.pp
  include/violite.h
  libmysql/libmysql.c
  libmysql/libmysql.def
  libmysqld/CMakeLists.txt
  libmysqld/Makefile.am
  libmysqld/lib_sql.cc
  libmysqld/libmysqld.c
  libmysqld/libmysqld.def
  mysql-test/collections/README.experimental
  mysql-test/collections/default.experimental
  mysql-test/extra/binlog_tests/binlog.test
  mysql-test/extra/binlog_tests/drop_temp_table.test
  mysql-test/extra/rpl_tests/rpl_auto_increment.test
  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
  mysql-test/extra/rpl_tests/rpl_failed_optimize.test
  mysql-test/extra/rpl_tests/rpl_loaddata.test
  mysql-test/extra/rpl_tests/rpl_row_sp006.test
  mysql-test/extra/rpl_tests/rpl_stm_000001.test
  mysql-test/include/check-warnings.test
  mysql-test/include/concurrent.inc
  mysql-test/include/have_example_plugin.inc
  mysql-test/include/have_simple_parser.inc
  mysql-test/include/have_udf.inc
  mysql-test/include/mix1.inc
  mysql-test/include/mtr_warnings.sql
  mysql-test/lib/My/ConfigFactory.pm
  mysql-test/lib/My/Platform.pm
  mysql-test/lib/My/SafeProcess/safe_kill_win.cc
  mysql-test/lib/My/SafeProcess/safe_process_win.cc
  mysql-test/lib/mtr_cases.pm
  mysql-test/lib/mtr_report.pm
  mysql-test/lib/v1/mtr_cases.pl
  mysql-test/mysql-stress-test.pl
  mysql-test/mysql-test-run.pl
  mysql-test/r/almost_full.result
  mysql-test/r/alter_table.result
  mysql-test/r/analyse.result
  mysql-test/r/archive.result
  mysql-test/r/bug46080.result
  mysql-test/r/create.result
  mysql-test/r/ctype_ldml.result
  mysql-test/r/ctype_uca.result
  mysql-test/r/delete.result
  mysql-test/r/distinct.result
  mysql-test/r/explain.result
  mysql-test/r/func_group.result
  mysql-test/r/func_in.result
  mysql-test/r/func_str.result
  mysql-test/r/gis-rtree.result
  mysql-test/r/gis.result
  mysql-test/r/grant.result
  mysql-test/r/grant3.result
  mysql-test/r/group_min_max.result
  mysql-test/r/information_schema_db.result
  mysql-test/r/innodb-autoinc.result
  mysql-test/r/innodb-index.result
  mysql-test/r/innodb_file_format.result
  mysql-test/r/innodb_mysql.result
  mysql-test/r/insert_select.result
  mysql-test/r/join.result
  mysql-test/r/lowercase_fs_off.result
  mysql-test/r/lowercase_table3.result
  mysql-test/r/myisam.result
  mysql-test/r/myisam_crash_before_flush_keys.result
  mysql-test/r/mysqlbinlog.result
  mysql-test/r/mysqltest.result
  mysql-test/r/olap.result
  mysql-test/r/order_by.result
  mysql-test/r/partition.result
  mysql-test/r/partition_csv.result
  mysql-test/r/partition_innodb.result
  mysql-test/r/partition_pruning.result
  mysql-test/r/ps_grant.result
  mysql-test/r/query_cache.result
  mysql-test/r/range.result
  mysql-test/r/select.result
  mysql-test/r/sp-error.result
  mysql-test/r/sp.result
  mysql-test/r/subselect.result
  mysql-test/r/subselect3.result
  mysql-test/r/system_mysql_db.result
  mysql-test/r/trigger_notembedded.result
  mysql-test/r/type_bit.result
  mysql-test/r/type_newdecimal.result
  mysql-test/r/udf.result
  mysql-test/r/update.result
  mysql-test/r/upgrade.result
  mysql-test/r/view_grant.result
  mysql-test/r/warnings.result
  mysql-test/r/windows.result
  mysql-test/r/xa.result
  mysql-test/std_data/Index.xml
  mysql-test/suite/binlog/r/binlog_killed_simulate.result
  mysql-test/suite/binlog/r/binlog_row_binlog.result
  mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
  mysql-test/suite/binlog/r/binlog_stm_binlog.result
  mysql-test/suite/binlog/r/binlog_stm_blackhole.result
  mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
  mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test
  mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
  mysql-test/suite/federated/my.cnf
  mysql-test/suite/funcs_1/r/is_columns_mysql.result
  mysql-test/suite/funcs_1/r/is_statistics.result
  mysql-test/suite/innodb/r/innodb-zip.result
  mysql-test/suite/innodb/t/innodb-zip.test
  mysql-test/suite/innodb/t/innodb_information_schema.test
  mysql-test/suite/parts/inc/partition_auto_increment.inc
  mysql-test/suite/parts/r/partition_auto_increment_innodb.result
  mysql-test/suite/parts/r/partition_auto_increment_maria.result
  mysql-test/suite/parts/r/partition_auto_increment_memory.result
  mysql-test/suite/parts/r/partition_auto_increment_myisam.result
  mysql-test/suite/parts/r/partition_auto_increment_ndb.result
  mysql-test/suite/parts/r/partition_recover_myisam.result
  mysql-test/suite/parts/t/partition_auto_increment_archive.test
  mysql-test/suite/parts/t/partition_auto_increment_blackhole.test
  mysql-test/suite/parts/t/partition_recover_myisam.test
  mysql-test/suite/pbxt/r/func_group.result
  mysql-test/suite/pbxt/r/grant.result
  mysql-test/suite/pbxt/r/group_min_max.result
  mysql-test/suite/pbxt/r/join_nested.result
  mysql-test/suite/pbxt/r/negation_elimination.result
  mysql-test/suite/pbxt/r/ps_grant.result
  mysql-test/suite/pbxt/r/skip_grants.result
  mysql-test/suite/pbxt/r/subselect.result
  mysql-test/suite/pbxt/r/view_grant.result
  mysql-test/suite/pbxt/t/grant.test
  mysql-test/suite/pbxt/t/ps_grant.test
  mysql-test/suite/pbxt/t/subselect.test
  mysql-test/suite/rpl/r/rpl_auto_increment.result
  mysql-test/suite/rpl/r/rpl_bug33931.result
  mysql-test/suite/rpl/r/rpl_do_grant.result
  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
  mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
  mysql-test/suite/rpl/r/rpl_idempotency.result
  mysql-test/suite/rpl/r/rpl_init_slave_errors.result
  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
  mysql-test/suite/rpl/r/rpl_loaddata.result
  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
  mysql-test/suite/rpl/r/rpl_loaddata_map.result
  mysql-test/suite/rpl/r/rpl_loaddatalocal.result
  mysql-test/suite/rpl/r/rpl_log_pos.result
  mysql-test/suite/rpl/r/rpl_packet.result
  mysql-test/suite/rpl/r/rpl_row_create_table.result
  mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
  mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
  mysql-test/suite/rpl/r/rpl_stm_log.result
  mysql-test/suite/rpl/r/rpl_temporary_errors.result
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/suite/rpl/t/rpl_bug33931.test
  mysql-test/suite/rpl/t/rpl_do_grant.test
  mysql-test/suite/rpl/t/rpl_drop_temp.test
  mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
  mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
  mysql-test/suite/rpl/t/rpl_idempotency.test
  mysql-test/suite/rpl/t/rpl_init_slave_errors.test
  mysql-test/suite/rpl/t/rpl_loaddatalocal.test
  mysql-test/suite/rpl/t/rpl_log_pos.test
  mysql-test/suite/rpl/t/rpl_packet.test
  mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
  mysql-test/suite/rpl/t/rpl_temporary_errors.test
  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
  mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
  mysql-test/t/almost_full.test
  mysql-test/t/alter_table.test
  mysql-test/t/analyse.test
  mysql-test/t/archive.test
  mysql-test/t/bug46080.test
  mysql-test/t/create.test
  mysql-test/t/ctype_ldml.test
  mysql-test/t/ctype_uca.test
  mysql-test/t/delete.test
  mysql-test/t/disabled.def
  mysql-test/t/distinct.test
  mysql-test/t/explain.test
  mysql-test/t/flush_read_lock_kill.test
  mysql-test/t/func_group.test
  mysql-test/t/func_in.test
  mysql-test/t/func_str.test
  mysql-test/t/gis-rtree.test
  mysql-test/t/gis.test
  mysql-test/t/grant3.test
  mysql-test/t/information_schema_db.test
  mysql-test/t/innodb-autoinc.test
  mysql-test/t/innodb-index.test
  mysql-test/t/innodb_bug39438.test
  mysql-test/t/innodb_file_format.test
  mysql-test/t/innodb_mysql.test
  mysql-test/t/insert_select.test
  mysql-test/t/join.test
  mysql-test/t/kill.test
  mysql-test/t/lowercase_fs_off.test
  mysql-test/t/lowercase_table3.test
  mysql-test/t/myisam-system.test
  mysql-test/t/myisam.test
  mysql-test/t/myisam_crash_before_flush_keys.test
  mysql-test/t/mysqlbinlog.test
  mysql-test/t/mysqltest.test
  mysql-test/t/named_pipe.test
  mysql-test/t/olap.test
  mysql-test/t/order_by.test
  mysql-test/t/partition.test
  mysql-test/t/partition_csv.test
  mysql-test/t/partition_innodb.test
  mysql-test/t/plugin.test
  mysql-test/t/plugin_load.test
  mysql-test/t/ps_not_windows.test
  mysql-test/t/query_cache.test
  mysql-test/t/range.test
  mysql-test/t/select.test
  mysql-test/t/sp-error.test
  mysql-test/t/sp.test
  mysql-test/t/subselect.test
  mysql-test/t/subselect3.test
  mysql-test/t/type_bit.test
  mysql-test/t/type_newdecimal.test
  mysql-test/t/udf.test
  mysql-test/t/update.test
  mysql-test/t/upgrade.test
  mysql-test/t/view_grant.test
  mysql-test/t/warnings.test
  mysql-test/t/windows.test
  mysql-test/t/xa.test
  mysql-test/valgrind.supp
  mysys/CMakeLists.txt
  mysys/Makefile.am
  mysys/charset-def.c
  mysys/hash.c
  mysys/mf_keycache.c
  mysys/my_copy.c
  mysys/my_getopt.c
  mysys/my_largepage.c
  mysys/my_static.c
  mysys/my_thr_init.c
  mysys/my_wincond.c
  mysys/thr_lock.c
  mysys/typelib.c
  regex/CMakeLists.txt
  scripts/make_win_bin_dist
  scripts/mysql_system_tables.sql
  scripts/mysql_system_tables_fix.sql
  sql-common/client.c
  sql-common/my_time.c
  sql/CMakeLists.txt
  sql/Makefile.am
  sql/event_data_objects.cc
  sql/events.cc
  sql/field.cc
  sql/field.h
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster_binlog.cc
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/handler.cc
  sql/handler.h
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_cmpfunc.h
  sql/item_func.cc
  sql/item_func.h
  sql/item_geofunc.cc
  sql/item_strfunc.cc
  sql/item_subselect.cc
  sql/item_sum.cc
  sql/item_timefunc.cc
  sql/item_xmlfunc.cc
  sql/log.cc
  sql/log_event.cc
  sql/log_event.h
  sql/log_event_old.cc
  sql/my_decimal.h
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/opt_range.cc
  sql/opt_sum.cc
  sql/partition_info.cc
  sql/records.cc
  sql/repl_failsafe.cc
  sql/rpl_filter.cc
  sql/set_var.cc
  sql/set_var.h
  sql/share/errmsg.txt
  sql/slave.cc
  sql/slave.h
  sql/sp.cc
  sql/sp_head.cc
  sql/sql_acl.cc
  sql/sql_base.cc
  sql/sql_binlog.cc
  sql/sql_cache.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_db.cc
  sql/sql_delete.cc
  sql/sql_handler.cc
  sql/sql_insert.cc
  sql/sql_lex.h
  sql/sql_load.cc
  sql/sql_locale.cc
  sql/sql_parse.cc
  sql/sql_partition.cc
  sql/sql_plugin.cc
  sql/sql_prepare.cc
  sql/sql_rename.cc
  sql/sql_repl.cc
  sql/sql_select.cc
  sql/sql_select.h
  sql/sql_show.cc
  sql/sql_table.cc
  sql/sql_tablespace.cc
  sql/sql_trigger.cc
  sql/sql_udf.cc
  sql/sql_update.cc
  sql/sql_view.cc
  sql/sql_yacc.yy
  sql/structs.h
  sql/table.cc
  sql/table.h
  sql/time.cc
  sql/udf_example.c
  sql/unireg.cc
  storage/archive/ha_archive.cc
  storage/blackhole/ha_blackhole.cc
  storage/csv/ha_tina.cc
  storage/federatedx/ha_federatedx.cc
  storage/heap/hp_write.c
  storage/innobase/dict/dict0dict.c
  storage/innobase/handler/ha_innodb.cc
  storage/innobase/handler/ha_innodb.h
  storage/innobase/os/os0proc.c
  storage/innobase/row/row0mysql.c
  storage/innodb_plugin/CMakeLists.txt
  storage/innodb_plugin/ChangeLog
  storage/innodb_plugin/Makefile.am
  storage/innodb_plugin/btr/btr0btr.c
  storage/innodb_plugin/btr/btr0sea.c
  storage/innodb_plugin/buf/buf0buf.c
  storage/innodb_plugin/buf/buf0flu.c
  storage/innodb_plugin/buf/buf0lru.c
  storage/innodb_plugin/buf/buf0rea.c
  storage/innodb_plugin/dict/dict0crea.c
  storage/innodb_plugin/dict/dict0dict.c
  storage/innodb_plugin/fil/fil0fil.c
  storage/innodb_plugin/fsp/fsp0fsp.c
  storage/innodb_plugin/handler/ha_innodb.cc
  storage/innodb_plugin/handler/ha_innodb.h
  storage/innodb_plugin/handler/handler0alter.cc
  storage/innodb_plugin/include/buf0buf.h
  storage/innodb_plugin/include/buf0buf.ic
  storage/innodb_plugin/include/buf0lru.h
  storage/innodb_plugin/include/buf0rea.h
  storage/innodb_plugin/include/buf0types.h
  storage/innodb_plugin/include/dict0crea.h
  storage/innodb_plugin/include/dict0dict.h
  storage/innodb_plugin/include/dict0mem.h
  storage/innodb_plugin/include/fsp0fsp.h
  storage/innodb_plugin/include/lock0lock.h
  storage/innodb_plugin/include/log0log.h
  storage/innodb_plugin/include/log0log.ic
  storage/innodb_plugin/include/log0recv.h
  storage/innodb_plugin/include/mtr0mtr.h
  storage/innodb_plugin/include/os0file.h
  storage/innodb_plugin/include/os0sync.h
  storage/innodb_plugin/include/page0page.h
  storage/innodb_plugin/include/page0page.ic
  storage/innodb_plugin/include/page0zip.h
  storage/innodb_plugin/include/rem0cmp.h
  storage/innodb_plugin/include/rem0rec.ic
  storage/innodb_plugin/include/row0ins.h
  storage/innodb_plugin/include/row0mysql.h
  storage/innodb_plugin/include/srv0srv.h
  storage/innodb_plugin/include/trx0rec.h
  storage/innodb_plugin/include/trx0rec.ic
  storage/innodb_plugin/include/trx0roll.h
  storage/innodb_plugin/include/trx0sys.ic
  storage/innodb_plugin/include/trx0trx.h
  storage/innodb_plugin/include/univ.i
  storage/innodb_plugin/include/ut0auxconf.h
  storage/innodb_plugin/include/ut0byte.h
  storage/innodb_plugin/include/ut0byte.ic
  storage/innodb_plugin/include/ut0ut.h
  storage/innodb_plugin/lock/lock0lock.c
  storage/innodb_plugin/log/log0log.c
  storage/innodb_plugin/log/log0recv.c
  storage/innodb_plugin/mem/mem0mem.c
  storage/innodb_plugin/mtr/mtr0mtr.c
  storage/innodb_plugin/mysql-test/innodb-analyze.test
  storage/innodb_plugin/mysql-test/innodb-zip.result
  storage/innodb_plugin/mysql-test/innodb-zip.test
  storage/innodb_plugin/mysql-test/innodb_bug34300.test
  storage/innodb_plugin/mysql-test/innodb_bug36169.test
  storage/innodb_plugin/mysql-test/innodb_bug36172.test
  storage/innodb_plugin/mysql-test/innodb_file_format.result
  storage/innodb_plugin/mysql-test/innodb_file_format.test
  storage/innodb_plugin/os/os0file.c
  storage/innodb_plugin/os/os0proc.c
  storage/innodb_plugin/page/page0cur.c
  storage/innodb_plugin/page/page0page.c
  storage/innodb_plugin/page/page0zip.c
  storage/innodb_plugin/plug.in.disabled
  storage/innodb_plugin/rem/rem0cmp.c
  storage/innodb_plugin/row/row0ins.c
  storage/innodb_plugin/row/row0merge.c
  storage/innodb_plugin/row/row0mysql.c
  storage/innodb_plugin/srv/srv0srv.c
  storage/innodb_plugin/srv/srv0start.c
  storage/innodb_plugin/sync/sync0rw.c
  storage/innodb_plugin/sync/sync0sync.c
  storage/innodb_plugin/thr/thr0loc.c
  storage/innodb_plugin/trx/trx0rec.c
  storage/innodb_plugin/trx/trx0roll.c
  storage/innodb_plugin/trx/trx0trx.c
  storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_solaris.c
  storage/innodb_plugin/ut/ut0ut.c
  storage/maria/ha_maria.cc
  storage/myisam/ha_myisam.cc
  storage/myisam/mi_check.c
  storage/myisam/mi_search.c
  storage/myisam/mi_write.c
  storage/myisam/myisamchk.c
  storage/myisam/sort.c
  storage/myisammrg/myrg_open.c
  storage/mysql_storage_engine.cmake
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
  storage/ndb/src/kernel/blocks/suma/Suma.cpp
  storage/pbxt/src/discover_xt.cc
  storage/xtradb/dict/dict0dict.c
  storage/xtradb/handler/ha_innodb.cc
  storage/xtradb/handler/ha_innodb.h
  storage/xtradb/handler/handler0alter.cc
  strings/ctype-mb.c
  strings/ctype-simple.c
  strings/ctype-uca.c
  strings/ctype-ucs2.c
  support-files/binary-configure.sh
  tests/mysql_client_test.c
  unittest/mysys/Makefile.am
  vio/vio.c
  vio/vio_priv.h
  vio/viosocket.c
  vio/viosslfactories.c
  mysql-test/r/innodb_lock_wait_timeout_1.result
  mysql-test/t/innodb_lock_wait_timeout_1.test
The size of the diff (41758 lines) is larger than your specified limit of 5000 lines

--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.