From: Ole John Aske Date: August 29 2011 1:39pm Subject: bzr push into mysql-5.5-cluster branch (ole.john.aske:3443 to 3444) List-Archive: http://lists.mysql.com/commits/140837 Message-Id: <20110829133948.88322218@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3444 Ole John Aske 2011-08-29 [merge] Merge mainline mysql-5.5.14 -> mysql-5.5-cluster added: include/mysql/thread_pool_priv.h mysql-test/include/not_threadpool.inc mysql-test/lib/mtr_results.pm mysql-test/r/archive_debug.result mysql-test/r/implicit_char_to_num_conversion.result mysql-test/r/secure_file_priv_win.result mysql-test/r/status_bug17954.result mysql-test/suite/binlog/r/binlog_reset_master.result mysql-test/suite/binlog/t/binlog_reset_master.test mysql-test/suite/innodb/r/innodb_index_large_prefix.result mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result mysql-test/suite/innodb/t/innodb_index_large_prefix.test mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test mysql-test/suite/rpl/t/rpl_typeconv-master.opt mysql-test/t/archive_debug.test mysql-test/t/implicit_char_to_num_conversion.test mysql-test/t/secure_file_priv_win-master.opt mysql-test/t/secure_file_priv_win.test mysql-test/t/status_bug17954.test modified: .bzrignore BUILD/SETUP.sh BUILD/build_mccge.sh CMakeLists.txt VERSION client/mysql.cc client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqlcheck.c client/mysqldump.c client/mysqlimport.c client/mysqlshow.c client/mysqlslap.c client/mysqltest.cc cmake/configure.pl cmake/install_layout.cmake cmake/os/WindowsCache.cmake cmake/plugin.cmake configure.cmake include/my_base.h include/my_compiler.h include/my_getopt.h include/my_sys.h include/mysql/plugin_audit.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/violite.h libmysql/authentication_win/plugin_client.cc libmysql/errmsg.c libmysqld/lib_sql.cc mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/check_type.inc mysql-test/include/have_archive_plugin.inc mysql-test/include/have_blackhole_plugin.inc mysql-test/include/wait_show_condition.inc mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/Test.pm mysql-test/lib/mtr_cases.pm mysql-test/lib/mtr_misc.pl mysql-test/lib/mtr_report.pm mysql-test/mysql-test-run.pl mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_utf16.result mysql-test/r/ctype_utf8.result mysql-test/r/distinct.result mysql-test/r/events_bugs.result mysql-test/r/explain.result mysql-test/r/func_math.result mysql-test/r/func_time.result mysql-test/r/innodb_mysql_lock.result mysql-test/r/innodb_mysql_sync.result mysql-test/r/metadata.result mysql-test/r/openssl_1.result mysql-test/r/plugin_auth.result mysql-test/r/query_cache_debug.result mysql-test/r/sp-security.result mysql-test/r/sp.result mysql-test/r/status.result mysql-test/r/subselect.result mysql-test/r/type_newdecimal.result mysql-test/r/type_ranges.result mysql-test/r/variables-big.result mysql-test/r/xml.result mysql-test/suite/binlog/r/binlog_innodb_row.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/t/binlog_innodb_row.test mysql-test/suite/binlog/t/disabled.def mysql-test/suite/federated/disabled.def mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/suite/perfschema/t/no_threads.test mysql-test/suite/perfschema/t/one_thread_per_con.test mysql-test/suite/rpl/r/rpl_loaddatalocal.result mysql-test/suite/rpl/r/rpl_relayspace.result mysql-test/suite/rpl/r/rpl_show_slave_hosts.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_loaddatalocal.test mysql-test/suite/rpl/t/rpl_relayspace.test mysql-test/suite/rpl/t/rpl_show_slave_hosts.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/t/all_vars.test mysql-test/suite/sys_vars/t/disabled.def mysql-test/suite/sys_vars/t/slow_launch_time_func.test mysql-test/suite/sys_vars/t/thread_cache_size_func.test mysql-test/suite/sys_vars/t/wait_timeout_func.test mysql-test/t/ctype_utf16.test mysql-test/t/disabled.def mysql-test/t/distinct.test mysql-test/t/events_bugs.test mysql-test/t/explain.test mysql-test/t/func_math.test mysql-test/t/func_time.test mysql-test/t/information_schema.test mysql-test/t/information_schema_db.test mysql-test/t/innodb_mysql_lock.test mysql-test/t/innodb_mysql_sync.test mysql-test/t/kill.test mysql-test/t/mysqlshow.test mysql-test/t/named_pipe.test mysql-test/t/no-threads.test mysql-test/t/plugin_auth.test mysql-test/t/query_cache_debug.test mysql-test/t/shm.test mysql-test/t/sp-security.test mysql-test/t/sp.test mysql-test/t/status.test mysql-test/t/subselect.test mysql-test/t/type_newdecimal.test mysql-test/t/variables-big.test mysql-test/t/xml.test mysys/lf_alloc-pin.c mysys/my_handler_errors.h mysys/my_symlink.c mysys/my_sync.c packaging/WiX/ca/CMakeLists.txt packaging/WiX/create_msi.cmake.in packaging/WiX/custom_ui.wxs plugin/audit_null/audit_null.c sql-common/client.c sql/debug_sync.cc sql/debug_sync.h sql/derror.cc sql/event_db_repository.cc sql/event_db_repository.h sql/events.cc sql/field.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/item.cc sql/item_cmpfunc.cc sql/item_create.cc sql/item_func.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.h sql/log_event.cc sql/mdl.cc sql/my_decimal.cc sql/my_decimal.h sql/mysqld.cc sql/mysqld.h sql/password.c sql/rpl_rli.cc sql/scheduler.cc sql/scheduler.h sql/set_var.cc sql/share/errmsg-utf8.txt sql/sp_head.cc sql/sp_head.h sql/sql_acl.cc sql/sql_audit.cc sql/sql_base.cc sql/sql_binlog.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_connect.h sql/sql_cursor.h sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_priv.h sql/sql_reload.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_show.cc sql/sql_table.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/unireg.cc storage/archive/azio.c storage/archive/ha_archive.cc storage/example/ha_example.cc storage/innobase/btr/btr0cur.c storage/innobase/buf/buf0buf.c storage/innobase/data/data0data.c storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/dict/dict0mem.c storage/innobase/fil/fil0fil.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/include/buf0buf.h storage/innobase/include/db0err.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0load.h storage/innobase/include/dict0mem.h storage/innobase/include/lock0lock.h storage/innobase/include/lock0lock.ic storage/innobase/include/mtr0mtr.ic storage/innobase/include/page0page.h storage/innobase/include/page0page.ic storage/innobase/include/rem0types.h storage/innobase/include/row0ext.h storage/innobase/include/row0ext.ic storage/innobase/include/row0row.h storage/innobase/include/row0row.ic storage/innobase/include/univ.i storage/innobase/lock/lock0lock.c storage/innobase/mtr/mtr0mtr.c storage/innobase/os/os0file.c storage/innobase/page/page0page.c storage/innobase/page/page0zip.c storage/innobase/rem/rem0rec.c storage/innobase/row/row0ext.c storage/innobase/row/row0mysql.c storage/innobase/row/row0row.c storage/innobase/row/row0sel.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0srv.c storage/innobase/trx/trx0rec.c storage/innobase/trx/trx0undo.c storage/innobase/ut/ut0ut.c strings/decimal.c tests/mysql_client_test.c unittest/mysys/lf-t.c vio/test-ssl.c vio/test-sslclient.c vio/test-sslserver.c vio/viossl.c vio/viosslfactories.c vio/viotest-ssl.c 3443 jonas oreland 2011-08-27 ndb - merge error in .bzr-mysql/default.conf modified: .bzr-mysql/default.conf Diff too large for email (16262 lines, the limit is 10000). No bundle (reason: useless for push emails).