List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:October 27 2010 2:49pm
Subject:bzr commit into mysql-next-mr-innodb branch (vasil.dimov:3275)
View as plain text  
#At file:///usr/local/devel/bzrroot/server/mysql-next-mr-innodb/ based on revid:marko.makela@stripped

 3275 Vasil Dimov	2010-10-27 [merge]
      Merge mysql-next-mr-bugfixing -> mysql-next-mr-innodb

    added:
      mysql-test/include/have_plugin_interface.inc
      mysql-test/include/have_plugin_server.inc
      mysql-test/r/plugin_auth_qa.result
      mysql-test/r/plugin_auth_qa_1.result
      mysql-test/r/plugin_auth_qa_2.result
      mysql-test/r/plugin_auth_qa_3.result
      mysql-test/suite/innodb/r/innodb_bug57255.result
      mysql-test/suite/innodb/t/innodb_bug57255.test
      mysql-test/t/plugin_auth_qa-master.opt
      mysql-test/t/plugin_auth_qa.test
      mysql-test/t/plugin_auth_qa_1-master.opt
      mysql-test/t/plugin_auth_qa_1.test
      mysql-test/t/plugin_auth_qa_2-master.opt
      mysql-test/t/plugin_auth_qa_2.test
      mysql-test/t/plugin_auth_qa_3-master.opt
      mysql-test/t/plugin_auth_qa_3.test
      plugin/auth/qa_auth_client.c
      plugin/auth/qa_auth_interface.c
      plugin/auth/qa_auth_server.c
    modified:
      CMakeLists.txt
      client/mysql.cc
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqltest.cc
      cmake/os/Linux.cmake
      cmd-line-utils/readline/complete.c
      cmd-line-utils/readline/histexpand.c
      cmd-line-utils/readline/histfile.c
      cmd-line-utils/readline/isearch.c
      cmd-line-utils/readline/parens.c
      cmd-line-utils/readline/readline.c
      cmd-line-utils/readline/text.c
      include/my_compiler.h
      include/my_getopt.h
      include/my_pthread.h
      include/mysql.h
      include/mysql.h.pp
      mysql-test/extra/binlog_tests/implicit.test
      mysql-test/extra/rpl_tests/create_recursive_construct.inc
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_row_sp003.test
      mysql-test/include/check_concurrent_insert.inc
      mysql-test/include/check_no_concurrent_insert.inc
      mysql-test/include/commit.inc
      mysql-test/include/common-tests.inc
      mysql-test/include/concurrent.inc
      mysql-test/include/deadlock.inc
      mysql-test/include/get_relay_log_pos.inc
      mysql-test/include/handler.inc
      mysql-test/include/index_merge1.inc
      mysql-test/include/index_merge2.inc
      mysql-test/include/index_merge_2sweeps.inc
      mysql-test/include/index_merge_ror.inc
      mysql-test/include/index_merge_ror_cpk.inc
      mysql-test/include/kill_query.inc
      mysql-test/include/kill_query_and_diff_master_slave.inc
      mysql-test/include/loaddata_autocom.inc
      mysql-test/include/mix1.inc
      mysql-test/include/mix2.inc
      mysql-test/include/query_cache.inc
      mysql-test/include/read_many_rows.inc
      mysql-test/include/rowid_order.inc
      mysql-test/include/select.inc
      mysql-test/include/setup_fake_relay_log.inc
      mysql-test/include/show_events.inc
      mysql-test/include/show_rpl_debug_info.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/include/unsafe_binlog.inc
      mysql-test/include/wait_for_slave_io_error.inc
      mysql-test/include/wait_for_slave_param.inc
      mysql-test/include/wait_for_slave_sql_error.inc
      mysql-test/include/wait_for_status_var.inc
      mysql-test/lib/mtr_misc.pl
      mysql-test/lib/mtr_process.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/archive.result
      mysql-test/r/archive_gis.result
      mysql-test/r/cache_innodb.result
      mysql-test/r/commit_1innodb.result
      mysql-test/r/compress.result
      mysql-test/r/concurrent_innodb_safelog.result
      mysql-test/r/concurrent_innodb_unsafelog.result
      mysql-test/r/create.result
      mysql-test/r/deadlock_innodb.result
      mysql-test/r/grant.result
      mysql-test/r/group_by.result
      mysql-test/r/handler_innodb.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/heap.result
      mysql-test/r/heap_hash.result
      mysql-test/r/index_merge_innodb.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/information_schema.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/innodb_mrr_none.result
      mysql-test/r/loaddata_autocom_innodb.result
      mysql-test/r/lock_sync.result
      mysql-test/r/log_state.result
      mysql-test/r/log_tables.result
      mysql-test/r/merge.result
      mysql-test/r/merge_mmap.result
      mysql-test/r/mix2_myisam.result
      mysql-test/r/myisam.result
      mysql-test/r/mysql.result
      mysql-test/r/mysqladmin.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/mysqldump-max.result
      mysql-test/r/mysqldump.result
      mysql-test/r/mysqlshow.result
      mysql-test/r/named_pipe.result
      mysql-test/r/optimizer_switch.result
      mysql-test/r/partition.result
      mysql-test/r/ps.result
      mysql-test/r/rowid_order_innodb.result
      mysql-test/r/select_none.result
      mysql-test/r/shm.result
      mysql-test/r/signal.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp-security.result
      mysql-test/r/ssl.result
      mysql-test/r/ssl_compress.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_jcl6.result
      mysql-test/r/subquery_sj_all_jcl7.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_jcl6.result
      mysql-test/r/subquery_sj_dupsweed_jcl7.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_jcl6.result
      mysql-test/r/subquery_sj_firstmatch_jcl7.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_jcl6.result
      mysql-test/r/subquery_sj_loosescan_jcl7.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_jcl6.result
      mysql-test/r/subquery_sj_mat_jcl7.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_jcl6.result
      mysql-test/r/subquery_sj_none_jcl7.result
      mysql-test/r/trigger.result
      mysql-test/r/type_blob.result
      mysql-test/r/unsafe_binlog_innodb.result
      mysql-test/r/variables.result
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
      mysql-test/suite/funcs_1/r/innodb_trig_08.result
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result
      mysql-test/suite/funcs_1/r/memory_trig_08.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
      mysql-test/suite/funcs_1/r/myisam_trig_08.result
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_bug34053.result
      mysql-test/suite/innodb/r/innodb_bug35220.result
      mysql-test/suite/innodb/r/innodb_bug36172.result
      mysql-test/suite/innodb/r/innodb_bug38231.result
      mysql-test/suite/innodb/r/innodb_bug39438.result
      mysql-test/suite/innodb/r/innodb_bug56632.result
      mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/r/innodb_trx_weight.result
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_bug34053.test
      mysql-test/suite/innodb/t/innodb_bug35220.test
      mysql-test/suite/innodb/t/innodb_bug36172.test
      mysql-test/suite/innodb/t/innodb_bug38231.test
      mysql-test/suite/innodb/t/innodb_bug39438.test
      mysql-test/suite/innodb/t/innodb_bug56632.test
      mysql-test/suite/innodb/t/innodb_gis.test
      mysql-test/suite/innodb/t/innodb_trx_weight.test
      mysql-test/suite/parts/inc/partition.pre
      mysql-test/suite/parts/inc/partition_engine.inc
      mysql-test/suite/parts/inc/partition_syntax_2.inc
      mysql-test/suite/parts/inc/partition_value.inc
      mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
      mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
      mysql-test/suite/parts/r/partition_alter1_1_innodb.result
      mysql-test/suite/parts/r/partition_alter1_1_myisam.result
      mysql-test/suite/parts/r/partition_alter1_2_innodb.result
      mysql-test/suite/parts/r/partition_alter1_2_myisam.result
      mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result
      mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result
      mysql-test/suite/parts/r/partition_alter2_1_myisam.result
      mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result
      mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result
      mysql-test/suite/parts/r/partition_alter2_2_myisam.result
      mysql-test/suite/parts/r/partition_alter3_innodb.result
      mysql-test/suite/parts/r/partition_alter3_myisam.result
      mysql-test/suite/parts/r/partition_alter4_innodb.result
      mysql-test/suite/parts/r/partition_alter4_myisam.result
      mysql-test/suite/parts/r/partition_basic_innodb.result
      mysql-test/suite/parts/r/partition_basic_myisam.result
      mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
      mysql-test/suite/parts/r/partition_engine_innodb.result
      mysql-test/suite/parts/r/partition_engine_myisam.result
      mysql-test/suite/parts/r/partition_syntax_innodb.result
      mysql-test/suite/parts/r/partition_syntax_myisam.result
      mysql-test/suite/perfschema/t/disabled.def
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_row_sp003.result
      mysql-test/suite/rpl/r/rpl_row_trig003.result
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
      mysql-test/suite/rpl/t/rpl_do_grant.test
      mysql-test/suite/rpl/t/rpl_killed_ddl.test
      mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
      mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
      mysql-test/suite/sys_vars/r/log_basic.result
      mysql-test/suite/sys_vars/r/log_slow_queries_basic.result
      mysql-test/suite/sys_vars/r/sql_big_selects_func.result
      mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
      mysql-test/suite/sys_vars/r/sql_big_tables_func.result
      mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
      mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result
      mysql-test/suite/sys_vars/r/sql_max_join_size_func.result
      mysql-test/suite/sys_vars/r/storage_engine_basic.result
      mysql-test/suite/sys_vars/t/storage_engine_basic.test
      mysql-test/t/archive.test
      mysql-test/t/archive_gis.test
      mysql-test/t/create.test
      mysql-test/t/disabled.def
      mysql-test/t/grant.test
      mysql-test/t/group_by.test
      mysql-test/t/heap.test
      mysql-test/t/heap_hash.test
      mysql-test/t/information_schema.test
      mysql-test/t/innodb_icp_none.test
      mysql-test/t/innodb_mrr_none.test
      mysql-test/t/lock_sync.test
      mysql-test/t/log_tables.test
      mysql-test/t/merge.test
      mysql-test/t/merge_mmap.test
      mysql-test/t/mysql.test
      mysql-test/t/mysqladmin.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/t/mysqlcheck.test
      mysql-test/t/mysqldump-max.test
      mysql-test/t/mysqldump.test
      mysql-test/t/mysqlshow.test
      mysql-test/t/mysqltest.test
      mysql-test/t/optimizer_switch.test
      mysql-test/t/partition.test
      mysql-test/t/ps.test
      mysql-test/t/server_uuid_embedded.test
      mysql-test/t/sp-error.test
      mysql-test/t/sp-security.test
      mysql-test/t/type_blob.test
      mysql-test/t/wait_timeout.test
      mysys/my_gethwaddr.c
      mysys/my_getopt.c
      mysys/thr_mutex.c
      plugin/auth/CMakeLists.txt
      plugin/auth/Makefile.am
      sql-common/client.c
      sql/ha_partition.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_row.cc
      sql/item_row.h
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/log.cc
      sql/log_event.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_filter.cc
      sql/rpl_slave.cc
      sql/set_var.cc
      sql/set_var.h
      sql/share/errmsg-utf8.txt
      sql/sp.cc
      sql/sp.h
      sql/sp_head.cc
      sql/sp_head.h
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_help.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_priv.h
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_show.h
      sql/sql_union.cc
      sql/sys_vars.cc
      sql/sys_vars.h
      storage/heap/hp_rkey.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/que0que.h
      storage/innobase/os/os0sync.c
      storage/innobase/row/row0merge.c
      storage/innobase/row/row0mysql.c
      storage/innobase/ut/ut0ut.c
      storage/myisam/myisamchk.c
      strings/ctype-ucs2.c
      support-files/mysql.spec.sh
      unittest/examples/skip-t.c
      unittest/examples/skip_all-t.c
      unittest/examples/todo-t.c
      unittest/mytap/t/basic-t.c
      unittest/mytap/tap.c
      unittest/mytap/tap.h

Diff too large for email (13709 lines, the limit is 10000).
No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-next-mr-innodb branch (vasil.dimov:3275) vasil.dimov27 Oct