From: magnus.blaudd Date: October 5 2011 9:59am Subject: bzr push into mysql-5.5-cluster branch (magnus.blaudd:3570 to 3572) Bug#13059933 List-Archive: http://lists.mysql.com/commits/141307 X-Bug: 13059933 Message-Id: <201110050959.p959xaPA003003@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3572 magnus.blaudd@stripped 2011-10-05 Merge in opatch for Bug#13059933 modified: mysql-test/t/mysql_plugin.test 3571 magnus.blaudd@stripped 2011-10-05 ndb - add initializer for the new flag member when declaring our plugins modified: sql/ha_ndbcluster.cc 3570 magnus.blaudd@stripped 2011-10-05 [merge] Merge 5.5.16 into 5.5-cluster added: client/mysql_plugin.c mysql-test/include/daemon_example_bad_format.ini mysql-test/include/daemon_example_bad_soname.ini mysql-test/r/mysql_plugin.result mysql-test/suite/rpl/r/rpl_row_corruption.result mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt mysql-test/suite/rpl/t/rpl_row_corruption.test mysql-test/suite/sys_vars/r/innodb_file_format_max_basic.result mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result mysql-test/suite/sys_vars/r/innodb_rollback_segments_basic.result mysql-test/suite/sys_vars/r/innodb_stats_method_basic.result mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test mysql-test/suite/sys_vars/t/innodb_rollback_segments_basic.test mysql-test/suite/sys_vars/t/innodb_stats_method_basic.test mysql-test/t/mysql_plugin-master.opt mysql-test/t/mysql_plugin.test plugin/daemon_example/daemon_example.ini modified: VERSION client/CMakeLists.txt client/mysql.cc client/mysql_upgrade.c client/mysqladmin.cc client/mysqlcheck.c client/mysqldump.c client/mysqlimport.c client/mysqlshow.c client/mysqltest.cc cmake/plugin.cmake config.h.cmake configure.cmake dbug/dbug_analyze.c dbug/my_main.c dbug/tests.c include/my_global.h include/mysql/plugin.h include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h.pp libmysql/authentication_win/common.cc libmysql/authentication_win/common.h libmysql/authentication_win/handshake_client.cc libmysql/authentication_win/log_client.cc libmysqld/examples/CMakeLists.txt mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_reset_slave.test mysql-test/include/plugin.defs mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl mysql-test/r/ctype_errors.result mysql-test/r/ctype_utf32_uca.result mysql-test/r/func_math.result mysql-test/r/func_time.result mysql-test/r/information_schema.result mysql-test/r/merge.result mysql-test/r/order_by.result mysql-test/r/plugin_auth.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/type_float.result mysql-test/r/union.result mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/rpl/r/rpl_row_reset_slave.result mysql-test/suite/rpl/r/rpl_stm_reset_slave.result mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test mysql-test/t/ctype_errors.test mysql-test/t/ctype_utf32_uca.test mysql-test/t/disabled.def mysql-test/t/func_math.test mysql-test/t/func_time.test mysql-test/t/implicit_commit.test mysql-test/t/information_schema.test mysql-test/t/merge.test mysql-test/t/order_by.test mysql-test/t/plugin_auth.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/type_float.test mysql-test/t/union.test mysys/my_init.c plugin/audit_null/audit_null.c plugin/auth/auth_socket.c plugin/auth/dialog.c plugin/auth/qa_auth_interface.c plugin/auth/qa_auth_server.c plugin/auth/test_plugin.c plugin/daemon_example/CMakeLists.txt plugin/daemon_example/daemon_example.cc plugin/fulltext/plugin_example.c plugin/semisync/semisync_master_plugin.cc plugin/semisync/semisync_slave_plugin.cc sql/CMakeLists.txt sql/gen_lex_hash.cc sql/ha_partition.cc sql/item_func.cc sql/item_strfunc.cc sql/item_timefunc.cc sql/log.cc sql/log_event.cc sql/mysqld.cc sql/protocol.cc sql/rpl_mi.cc sql/rpl_mi.h sql/share/errmsg-utf8.txt sql/sql_acl.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_error.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_profile.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_show.cc sql/sql_union.cc sql/sql_yacc.yy storage/archive/ha_archive.cc storage/blackhole/ha_blackhole.cc storage/csv/ha_tina.cc storage/example/ha_example.cc storage/federated/ha_federated.cc storage/heap/ha_heap.cc storage/innobase/btr/btr0pcur.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0rea.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/include/btr0pcur.h storage/innobase/include/btr0pcur.ic storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0lru.h storage/innobase/include/buf0rea.h storage/innobase/include/mtr0mtr.h storage/innobase/include/srv0srv.h storage/innobase/include/ut0mem.h storage/innobase/include/ut0mem.ic storage/innobase/mtr/mtr0mtr.c storage/innobase/row/row0sel.c storage/innobase/srv/srv0srv.c storage/innobase/ut/ut0mem.c storage/myisam/ha_myisam.cc storage/myisammrg/ha_myisammrg.cc storage/myisammrg/myrg_open.c storage/perfschema/ha_perfschema.cc strings/ctype-uca.c strings/decimal.c support-files/compiler_warnings.supp support-files/mysql.spec.sh tests/mysql_client_test.c === modified file 'mysql-test/t/mysql_plugin.test' --- a/mysql-test/t/mysql_plugin.test 2011-09-09 14:39:44 +0000 +++ b/mysql-test/t/mysql_plugin.test 2011-10-05 09:58:33 +0000 @@ -288,12 +288,12 @@ let $MYSQL_PLUGIN_CMD= $MYSQL_PLUGIN -n --echo # --echo # Show the help. --echo # -replace_result $MYSQL_PLUGIN mysql_plugin; ---replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/ /XX-m[0-9]+/XX/ +--replace_result $MYSQL_PLUGIN mysql_plugin $MYSQL_SERVER_VERSION XX.XX.XX +--replace_regex /Ver [0-9.]+/Ver V.V.VV/ --exec $MYSQL_PLUGIN --help -replace_result $MYSQL_PLUGIN mysql_plugin; ---replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/ /XX-m[0-9]+/XX/ +--replace_result $MYSQL_PLUGIN mysql_plugin $MYSQL_SERVER_VERSION XX.XX.XX +--replace_regex /Ver [0-9.]+/Ver V.V.VV/ --exec $MYSQL_PLUGIN --version # === modified file 'sql/ha_ndbcluster.cc' --- a/sql/ha_ndbcluster.cc 2011-10-05 08:56:12 +0000 +++ b/sql/ha_ndbcluster.cc 2011-10-05 09:52:52 +0000 @@ -18231,7 +18231,8 @@ mysql_declare_plugin(ndbcluster) 0x0100, /* plugin version */ ndb_status_variables_export,/* status variables */ system_variables, /* system variables */ - NULL /* config options */ + NULL, /* config options */ + 0 /* flags */ }, { MYSQL_STORAGE_ENGINE_PLUGIN, @@ -18245,7 +18246,8 @@ mysql_declare_plugin(ndbcluster) 0x0001, /* plugin version */ NULL, /* status variables */ ndbinfo_system_variables, /* system variables */ - NULL /* config options */ + NULL, /* config options */ + 0 /* flags */ } mysql_declare_plugin_end; No bundle (reason: useless for push emails).