[Commits] 4d15112: Merge tag 'mariadb-10.0.22' into 10.0-galera

Nirbhay Choubey nirbhay at mariadb.com
Sun Nov 1 00:07:04 EET 2015


revision-id: 4d1511296288782df0e3d9373396724e250b24c1
parent(s): 17b0b45b1de41a1b188c5de6c3e9d8e6ecc48a72 d775ecdd010daad4dc6147fba58acd006bf2c60c
committer: Nirbhay Choubey
branch nick: 10.0-galera
timestamp: 2015-10-31 18:07:02 -0400
message:

Merge tag 'mariadb-10.0.22' into 10.0-galera


 BUILD/compile-solaris-amd64                        |   2 +-
 VERSION                                            |   2 +-
 client/CMakeLists.txt                              |   3 +-
 client/mysql_upgrade.c                             |   1 +
 client/mysqlimport.c                               |   5 +-
 cmake/cpack_rpm.cmake                              |   1 +
 cmake/os/Windows.cmake                             |  10 +-
 extra/yassl/README                                 |  29 +
 extra/yassl/include/openssl/ssl.h                  |   2 +-
 extra/yassl/include/yassl_error.hpp                |   3 +-
 extra/yassl/src/buffer.cpp                         |   2 +-
 extra/yassl/src/handshake.cpp                      |   2 +
 extra/yassl/src/ssl.cpp                            |  29 +-
 extra/yassl/src/yassl_error.cpp                    |   4 +
 extra/yassl/src/yassl_imp.cpp                      |  15 +-
 extra/yassl/taocrypt/src/asn.cpp                   |   9 +-
 extra/yassl/taocrypt/src/rsa.cpp                   |   4 +
 extra/yassl/testsuite/cipher-test.sh               |   1 +
 include/decimal.h                                  |   8 +
 include/maria.h                                    |   2 +-
 include/my_alarm.h                                 |   2 +-
 include/my_base.h                                  |   8 +-
 include/my_dbug.h                                  |   4 +-
 include/my_global.h                                |   2 +-
 include/my_pthread.h                               |   8 +-
 include/my_sys.h                                   |  13 +-
 include/mysql.h                                    |   4 +-
 man/aria_chk.1                                     |   3 +-
 man/aria_dump_log.1                                |   5 +-
 man/aria_ftdump.1                                  |   3 +-
 man/aria_pack.1                                    |   3 +-
 man/aria_read_log.1                                |   3 +-
 man/comp_err.1                                     |  23 +-
 man/innochecksum.1                                 |  42 +-
 man/make_win_bin_dist.1                            |  17 +-
 man/msql2mysql.1                                   |  17 +-
 man/my_print_defaults.1                            |  41 +-
 man/myisam_ftdump.1                                |  17 +-
 man/myisamchk.1                                    | 185 ++++---
 man/myisamlog.1                                    |  17 +-
 man/myisampack.1                                   |  19 +-
 man/mysql-stress-test.pl.1                         |  23 +-
 man/mysql-test-run.pl.1                            | 537 +++++++++++++++----
 man/mysql.1                                        | 497 ++++++++++-------
 man/mysql.server.1                                 |  44 +-
 man/mysql_client_test.1                            |  25 +-
 man/mysql_config.1                                 |  39 +-
 man/mysql_convert_table_format.1                   |  26 +-
 man/mysql_find_rows.1                              |  17 +-
 man/mysql_fix_extensions.1                         |  17 +-
 man/mysql_install_db.1                             | 154 +++++-
 man/mysql_plugin.1                                 |  37 +-
 man/mysql_secure_installation.1                    |  21 +-
 man/mysql_setpermission.1                          |  35 +-
 man/mysql_tzinfo_to_sql.1                          |  20 +-
 man/mysql_upgrade.1                                | 450 +++++++++++++---
 man/mysql_waitpid.1                                |  17 +-
 man/mysql_zap.1                                    |  17 +-
 man/mysqlaccess.1                                  |  28 +-
 man/mysqladmin.1                                   | 220 ++++++--
 man/mysqlbinlog.1                                  | 264 ++++++---
 man/mysqlbug.1                                     |  25 +-
 man/mysqlcheck.1                                   | 320 ++++++++---
 man/mysqld.8                                       |  34 +-
 man/mysqld_multi.1                                 | 123 +----
 man/mysqld_safe.1                                  | 202 ++++---
 man/mysqldump.1                                    | 596 ++++++++++++++++-----
 man/mysqldumpslow.1                                |  26 +-
 man/mysqlhotcopy.1                                 |  39 +-
 man/mysqlimport.1                                  | 223 ++++++--
 man/mysqlshow.1                                    | 225 ++++++--
 man/mysqlslap.1                                    | 327 ++++++-----
 man/mysqltest.1                                    | 363 ++++++++++---
 man/ndbd.8                                         |  17 +-
 man/ndbd_redo_log_reader.1                         |  17 +-
 man/ndbmtd.8                                       |  17 +-
 man/perror.1                                       |  19 +-
 man/replace.1                                      |  17 +-
 man/resolve_stack_dump.1                           |  17 +-
 man/resolveip.1                                    |  17 +-
 mysql-test/disabled.def                            |   3 +-
 mysql-test/include/restart_mysqld.inc              |  20 +-
 mysql-test/mysql-test-run.pl                       |   5 -
 mysql-test/r/alter_table.result                    |   9 +
 mysql-test/r/derived.result                        |  27 +-
 mysql-test/r/dyncol.result                         |  15 +
 mysql-test/r/empty_server_name-8224.result         |   1 +
 mysql-test/r/events_1.result                       |   3 +-
 mysql-test/r/events_restart.result                 |  24 +-
 mysql-test/r/explain_non_select.result             |  41 ++
 mysql-test/r/func_if.result                        |  17 +
 mysql-test/r/func_misc.result                      | 204 ++++++-
 mysql-test/r/information_schema2.result            |  24 +-
 mysql-test/r/init_file_set_password-7656.result    |   8 +
 mysql-test/r/loadxml.result                        |  27 +
 mysql-test/r/lowercase_fs_on.result                |   3 +
 mysql-test/r/lowercase_table3.result               |  11 -
 mysql-test/r/mdev-504.result                       |   2 +
 mysql-test/r/mysql_upgrade-6984.result             |   1 +
 mysql-test/r/mysqldump.result                      |  29 +-
 mysql-test/r/partition_alter.result                |  53 ++
 mysql-test/r/partition_error.result                |   2 +-
 mysql-test/r/partition_innodb.result               |  34 ++
 mysql-test/r/ps.result                             |  21 +
 mysql-test/r/ps_change_master.result               |  22 +
 mysql-test/r/selectivity_no_engine.result          |  17 +
 mysql-test/r/skip_grants.result                    |   4 +-
 mysql-test/r/subselect.result                      |  94 +++-
 mysql-test/r/subselect_no_exists_to_in.result      |  94 +++-
 mysql-test/r/subselect_no_mat.result               |  94 +++-
 mysql-test/r/subselect_no_opts.result              |  94 +++-
 mysql-test/r/subselect_no_scache.result            |  94 +++-
 mysql-test/r/subselect_no_semijoin.result          |  94 +++-
 mysql-test/r/subselect_sj2.result                  |  33 ++
 mysql-test/r/subselect_sj2_jcl6.result             |  33 ++
 mysql-test/r/subselect_sj2_mat.result              |  33 ++
 mysql-test/r/update.result                         |  15 +
 mysql-test/r/view.result                           | 137 +++++
 mysql-test/std_data/bug16171518_1.dat              |  59 ++
 mysql-test/std_data/bug16171518_2.dat              |  12 +
 .../suite/binlog/r/binlog_mysqlbinlog_row.result   |   6 +-
 .../binlog/r/binlog_mysqlbinlog_row_innodb.result  |  72 +--
 .../binlog/r/binlog_mysqlbinlog_row_myisam.result  |  72 +--
 .../suite/innodb/r/innodb-alter-filewrite.result   |  30 ++
 mysql-test/suite/innodb/r/innodb_bug68148.result   |  36 ++
 mysql-test/suite/innodb/r/innodb_monitor.result    |   9 +
 .../innodb/r/innodb_simulate_comp_failures.result  |   2 +-
 mysql-test/suite/innodb/r/snapshot.result          |   8 +
 .../suite/innodb/t/innodb-alter-filewrite.test     |  32 ++
 .../suite/innodb/t/innodb_bug60229-master.opt      |   1 -
 mysql-test/suite/innodb/t/innodb_bug60229.test     |   4 +
 mysql-test/suite/innodb/t/innodb_bug68148.test     |  41 ++
 .../innodb/t/innodb_simulate_comp_failures.test    |   4 +-
 mysql-test/suite/innodb/t/snapshot.test            |  18 +
 mysql-test/suite/innodb/t/xa_recovery.test         |   6 +
 mysql-test/suite/jp/t/jp_enum_sjis-master.opt      |   1 -
 mysql-test/suite/jp/t/jp_enum_sjis.test            |   4 +
 mysql-test/suite/jp/t/jp_enum_ucs2-master.opt      |   1 -
 mysql-test/suite/jp/t/jp_enum_ucs2.test            |   4 +
 mysql-test/suite/jp/t/jp_enum_ujis-master.opt      |   1 -
 mysql-test/suite/jp/t/jp_enum_ujis.test            |   4 +
 mysql-test/suite/jp/t/jp_enum_utf8-master.opt      |   1 -
 mysql-test/suite/jp/t/jp_enum_utf8.test            |   4 +
 mysql-test/suite/parts/r/partition_debug.result    |  16 +
 mysql-test/suite/parts/t/partition_debug.test      |  18 +
 mysql-test/suite/perfschema/r/misc.result          |  15 +
 mysql-test/suite/perfschema/r/query_cache.result   |   4 +-
 mysql-test/suite/perfschema/t/misc.test            |  20 +
 mysql-test/suite/perfschema/t/query_cache.test     |   2 +
 .../suite/plugins/r/feedback_plugin_load.result    |   7 +-
 .../suite/plugins/r/feedback_plugin_send.result    |   7 +-
 .../suite/plugins/t/feedback_plugin_load.test      |  20 +-
 .../suite/plugins/t/feedback_plugin_send.test      |   9 +
 mysql-test/suite/roles/create_and_drop_role.result |   4 +
 mysql-test/suite/roles/create_and_drop_role.test   |   8 +
 mysql-test/suite/roles/ip-6401.test                |   3 +
 mysql-test/suite/roles/rebuild_role_grants.result  |   6 +
 mysql-test/suite/roles/rebuild_role_grants.test    |  13 +
 mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result    |   2 +
 mysql-test/suite/rpl/r/rpl_mdev8193.result         |  24 +
 mysql-test/suite/rpl/r/rpl_parallel.result         |  18 +
 mysql-test/suite/rpl/r/rpl_row_reset_slave.result  |   2 +-
 mysql-test/suite/rpl/r/rpl_row_to_stmt.result      |  28 +
 mysql-test/suite/rpl/r/rpl_stm_reset_slave.result  |   2 +-
 mysql-test/suite/rpl/t/rpl_gtid_mdev4820.test      |   4 +-
 mysql-test/suite/rpl/t/rpl_innodb_bug30888.opt     |   1 +
 mysql-test/suite/rpl/t/rpl_mdev8193.test           |  56 ++
 mysql-test/suite/rpl/t/rpl_parallel.test           |  22 +
 mysql-test/suite/rpl/t/rpl_row_to_stmt-master.opt  |   1 +
 mysql-test/suite/rpl/t/rpl_row_to_stmt-slave.opt   |   1 +
 mysql-test/suite/rpl/t/rpl_row_to_stmt.test        |  23 +
 .../sys_vars/r/innodb_monitor_disable_basic.result |   9 +
 .../sys_vars/r/innodb_monitor_enable_basic.result  |   9 +
 .../r/innodb_monitor_reset_all_basic.result        |   9 +
 .../sys_vars/r/innodb_monitor_reset_basic.result   |   9 +
 mysql-test/t/alter_table.test                      |  13 +
 mysql-test/t/derived.test                          |  35 +-
 mysql-test/t/dyncol.test                           |  12 +
 mysql-test/t/empty_server_name-8224.test           |   4 +
 mysql-test/t/events_1.test                         |   3 +-
 mysql-test/t/events_restart.test                   |  14 +-
 mysql-test/t/explain_non_select.test               |  42 ++
 mysql-test/t/func_if.test                          |  14 +
 mysql-test/t/func_misc.test                        | 207 ++++++-
 mysql-test/t/information_schema2.test              |  19 +-
 mysql-test/t/init_file_set_password-7656.test      |  26 +
 mysql-test/t/loadxml.test                          |  14 +
 mysql-test/t/lowercase_fs_on.test                  |  38 ++
 mysql-test/t/lowercase_table3-master.opt           |   1 -
 mysql-test/t/lowercase_table3.test                 |  37 --
 mysql-test/t/mdev-504.test                         |   4 +-
 mysql-test/t/mysql_upgrade-6984.test               |   3 +-
 mysql-test/t/mysqldump.test                        |  36 +-
 mysql-test/t/partition_alter.test                  |  66 +++
 mysql-test/t/partition_error.test                  |   2 +-
 mysql-test/t/partition_innodb.test                 |  42 ++
 mysql-test/t/ps.test                               |  22 +
 mysql-test/t/ps_change_master.test                 |  45 ++
 mysql-test/t/selectivity_no_engine.test            |  17 +
 mysql-test/t/skip_grants.test                      |   2 +-
 mysql-test/t/subselect.test                        |  99 +++-
 mysql-test/t/subselect_sj2.test                    |  39 ++
 mysql-test/t/update.test                           |  15 +
 mysql-test/t/view.test                             | 157 ++++++
 mysys/ma_dyncol.c                                  |   6 +-
 mysys/mf_keycache.c                                |  26 +-
 mysys/mulalloc.c                                   |  44 ++
 scripts/mysql_install_db.sh                        |   4 +-
 scripts/mysql_secure_installation.sh               |  32 +-
 scripts/mysql_system_tables_fix.sql                |   2 +
 sql/events.cc                                      | 178 +++---
 sql/events.h                                       |  16 +-
 sql/field.h                                        |  17 +-
 sql/field_conv.cc                                  |  16 +-
 sql/filesort.cc                                    |   1 -
 sql/ha_partition.cc                                |   1 +
 sql/hostname.cc                                    |   1 +
 sql/item.cc                                        |  21 +-
 sql/item.h                                         |   3 +-
 sql/item_cmpfunc.cc                                |  54 +-
 sql/item_func.cc                                   |  53 +-
 sql/item_func.h                                    |  39 +-
 sql/item_subselect.cc                              |  26 +-
 sql/item_subselect.h                               |   6 +
 sql/key.cc                                         |   1 -
 sql/lock.cc                                        |   1 -
 sql/log.cc                                         |   5 +-
 sql/log.h                                          |   1 -
 sql/log_event.cc                                   | 142 ++++-
 sql/log_event.h                                    |  74 ++-
 sql/log_slow.h                                     |  28 +-
 sql/mysqld.cc                                      |  28 +-
 sql/opt_range.cc                                   |  63 ++-
 sql/opt_subselect.cc                               | 140 +++--
 sql/opt_subselect.h                                |  13 +-
 sql/opt_sum.cc                                     |   6 +-
 sql/partition_info.cc                              |  51 +-
 sql/protocol.cc                                    |   1 -
 sql/records.cc                                     |   5 +-
 sql/records.h                                      |   2 +-
 sql/rpl_injector.cc                                |   1 -
 sql/rpl_mi.cc                                      |   1 -
 sql/rpl_parallel.cc                                |  43 +-
 sql/rpl_record_old.cc                              |   1 -
 sql/rpl_rli.cc                                     |   4 +-
 sql/slave.cc                                       |   6 +
 sql/sql_acl.cc                                     |  66 +--
 sql/sql_admin.h                                    |   2 +-
 sql/sql_base.cc                                    |  27 +-
 sql/sql_base.h                                     |   1 -
 sql/sql_class.cc                                   |  16 +-
 sql/sql_class.h                                    |   3 -
 sql/sql_connect.cc                                 |   1 -
 sql/sql_const.h                                    |   8 +-
 sql/sql_delete.cc                                  |  17 +-
 sql/sql_digest.h                                   |   7 +-
 sql/sql_error.cc                                   |   2 +
 sql/sql_handler.cc                                 |  38 +-
 sql/sql_handler.h                                  |   5 +-
 sql/sql_insert.cc                                  |  57 +-
 sql/sql_lex.cc                                     |  24 +-
 sql/sql_lex.h                                      |   2 +
 sql/sql_load.cc                                    |  13 +-
 sql/sql_manager.cc                                 |   1 -
 sql/sql_parse.cc                                   |  47 +-
 sql/sql_partition.cc                               |   1 -
 sql/sql_prepare.cc                                 |   7 +-
 sql/sql_profile.cc                                 |   1 -
 sql/sql_reload.cc                                  |   1 +
 sql/sql_repl.cc                                    |  19 +-
 sql/sql_select.cc                                  |  13 +
 sql/sql_select.h                                   |   3 +-
 sql/sql_show.cc                                    |  15 +-
 sql/sql_table.cc                                   |  11 +
 sql/sql_time.cc                                    |   1 -
 sql/sql_trigger.h                                  |   2 +
 sql/sql_union.cc                                   |   2 -
 sql/sql_update.cc                                  |  33 +-
 sql/sql_yacc.yy                                    |  19 +-
 sql/sys_vars.cc                                    |  40 +-
 sql/table.cc                                       |   8 +-
 sql/threadpool_unix.cc                             |   2 +-
 sql/unireg.h                                       |  12 +-
 storage/archive/archive_test.c                     |   2 +-
 storage/connect/ha_connect.cc                      |  32 +-
 storage/connect/odbconn.cpp                        |   6 +-
 storage/connect/reldef.h                           |   3 +-
 storage/connect/tabdos.cpp                         |   3 +-
 storage/connect/tabfix.cpp                         |  12 +-
 storage/connect/tabjson.cpp                        |  12 +-
 storage/connect/tabmul.cpp                         |   2 +-
 storage/connect/tabodbc.cpp                        |  17 +-
 storage/connect/value.cpp                          |  22 +-
 storage/connect/value.h                            |  20 +
 storage/federated/ha_federated.h                   |   2 +-
 storage/federatedx/federatedx_io_mysql.cc          |   1 +
 storage/innobase/CMakeLists.txt                    |  87 ++-
 storage/innobase/btr/btr0cur.cc                    |  34 +-
 storage/innobase/buf/buf0buf.cc                    |  59 +-
 storage/innobase/dict/dict0dict.cc                 |  58 +-
 storage/innobase/handler/ha_innodb.cc              |  38 +-
 storage/innobase/handler/handler0alter.cc          |   2 +-
 storage/innobase/include/dict0dict.h               |  28 +
 storage/innobase/include/ibuf0ibuf.ic              |   5 +-
 storage/innobase/include/os0sync.h                 | 167 +++++-
 storage/innobase/include/srv0mon.h                 |   4 +
 storage/innobase/include/srv0srv.h                 |  21 +-
 storage/innobase/include/sync0sync.h               |   9 +-
 storage/innobase/include/sync0sync.ic              |  19 +-
 storage/innobase/include/univ.i                    |   2 +-
 storage/innobase/lock/lock0lock.cc                 |   7 +-
 storage/innobase/log/log0log.cc                    |   8 +-
 storage/innobase/row/row0ins.cc                    |   2 +
 storage/innobase/row/row0log.cc                    |   4 +-
 storage/innobase/row/row0merge.cc                  |  51 +-
 storage/innobase/srv/srv0mon.cc                    |  34 ++
 storage/innobase/srv/srv0srv.cc                    |  34 +-
 storage/innobase/srv/srv0start.cc                  |   5 +-
 storage/innobase/trx/trx0sys.cc                    |  22 +-
 storage/maria/ma_blockrec.h                        |   2 +-
 storage/maria/ma_pagecache.c                       |  28 +-
 storage/myisam/myisamdef.h                         |   2 +-
 storage/perfschema/ha_perfschema.cc                |   2 +-
 storage/perfschema/pfs.cc                          |   1 +
 storage/perfschema/pfs_timer.cc                    |  40 +-
 storage/tokudb/hatoku_hton.cc                      |  20 +-
 .../tokudb/r/cluster_filter_hidden.result          |  32 +-
 .../mysql-test/tokudb/t/cluster_filter_hidden.test |  34 +-
 storage/xtradb/CMakeLists.txt                      |  78 +--
 storage/xtradb/api/api0api.cc                      |  12 +-
 storage/xtradb/btr/btr0cur.cc                      |   8 +
 storage/xtradb/buf/buf0buf.cc                      |  12 +-
 storage/xtradb/buf/buf0flu.cc                      |  19 +-
 storage/xtradb/dict/dict0dict.cc                   |  65 ---
 storage/xtradb/dict/dict0stats_bg.cc               |   8 +
 storage/xtradb/fil/fil0fil.cc                      |   9 +-
 storage/xtradb/handler/ha_innodb.cc                |  77 ++-
 storage/xtradb/handler/handler0alter.cc            | 166 +++---
 storage/xtradb/ibuf/ibuf0ibuf.cc                   |   4 +-
 storage/xtradb/include/dict0dict.h                 |  27 +-
 storage/xtradb/include/dict0dict.ic                |   2 +-
 storage/xtradb/include/fts0fts.h                   |   2 +-
 storage/xtradb/include/row0purge.h                 |  12 +-
 storage/xtradb/include/srv0mon.h                   |   4 +
 storage/xtradb/include/srv0srv.h                   |  12 +-
 storage/xtradb/include/univ.i                      |   5 +-
 storage/xtradb/log/log0log.cc                      |   3 +
 storage/xtradb/os/os0file.cc                       |  18 +
 storage/xtradb/row/row0import.cc                   | 107 ++--
 storage/xtradb/row/row0ins.cc                      |  71 ++-
 storage/xtradb/row/row0log.cc                      |   4 +-
 storage/xtradb/row/row0merge.cc                    |  51 +-
 storage/xtradb/row/row0purge.cc                    |  79 ++-
 storage/xtradb/row/row0sel.cc                      |   2 +-
 storage/xtradb/srv/srv0mon.cc                      |  34 ++
 storage/xtradb/srv/srv0srv.cc                      |   9 +-
 storage/xtradb/srv/srv0start.cc                    |  27 +-
 strings/conf_to_src.c                              |   2 +-
 strings/ctype.c                                    |   2 +-
 support-files/mysql.server.sh                      |  13 +-
 support-files/mysql.spec.sh                        |  14 +-
 win/packaging/ca/CustomAction.cpp                  |   2 +
 362 files changed, 9438 insertions(+), 3163 deletions(-)

diff --cc sql/mysqld.cc
index f75f544,bc4d857..323b851
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@@ -6249,36 -5507,19 +6259,44 @@@ int mysqld_main(int argc, char **argv
  
    execute_ddl_log_recovery();
  
-   if (Events::init(opt_noacl || opt_bootstrap))
+   /*
+     Change EVENTS_ORIGINAL to EVENTS_OFF (the default value) as there is no
+     point in using ORIGINAL during startup
+   */
+   if (Events::opt_event_scheduler == Events::EVENTS_ORIGINAL)
+     Events::opt_event_scheduler= Events::EVENTS_OFF;
+ 
+   Events::set_original_state(Events::opt_event_scheduler);
+   if (Events::init((THD*) 0, opt_noacl || opt_bootstrap))
      unireg_abort(1);
  
 +#ifdef WITH_WSREP /* WSREP AFTER SE */
    if (opt_bootstrap)
    {
 +    /*! bootstrap wsrep init was taken care of above */
 +  }
 +  else
 +  {
 +    wsrep_SE_initialized();
 +
 +    if (wsrep_before_SE())
 +    {
 +      /*! in case of no SST wsrep waits in view handler callback */
 +      wsrep_SE_init_grab();
 +      wsrep_SE_init_done();
 +      /*! in case of SST wsrep waits for wsrep->sst_received */
 +      wsrep_sst_continue();
 +    }
 +    else
 +    {
 +      wsrep_init_startup (false);
 +    }
 +
 +    wsrep_create_appliers(wsrep_slave_threads - 1);
 +  }
 +#endif /* WITH_WSREP */
 + if (opt_bootstrap)
 +  {
      select_thread_in_use= 0;                    // Allow 'kill' to work
      bootstrap(mysql_stdin);
      if (!kill_in_progress)
diff --cc sql/sql_acl.cc
index f565259,8316c7b..bab4659
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@@ -2558,13 -2558,8 +2558,15 @@@ int check_change_password(THD *thd, con
      my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--skip-grant-tables");
      return(1);
    }
 +
 +#ifdef WITH_WSREP
 +  if ((!WSREP(thd) || !thd->wsrep_applier) &&
-       !thd->slave_thread && !thd->security_ctx->priv_user[0])
++      !thd->slave_thread && !thd->security_ctx->priv_user[0] &&
++      !in_bootstrap)
 +#else
-   if (!thd->slave_thread && !thd->security_ctx->priv_user[0])
+   if (!thd->slave_thread && !thd->security_ctx->priv_user[0] &&
+       !in_bootstrap)
 +#endif /* WITH_WSREP */
    {
      my_message(ER_PASSWORD_ANONYMOUS_USER, ER(ER_PASSWORD_ANONYMOUS_USER),
                 MYF(0));
diff --cc storage/xtradb/handler/ha_innodb.cc
index 161c21e,c55a260..c4cf228
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@@ -4059,11 -3996,40 +4079,43 @@@ innobase_commit_low
  
  		trx_commit_for_mysql(trx);
  	}
 +#ifdef WITH_WSREP
 +	if (wsrep_on((void*)thd)) { thd_proc_info(thd, tmp); }
 +#endif /* WITH_WSREP */
  }
  
+ #if NOT_USED
+ /*****************************************************************//**
+ Stores the current binlog coordinates in the trx system header. */
+ static
+ int
+ innobase_store_binlog_info(
+ /*=======================*/
+ 	handlerton*	hton,	/*!< in: InnoDB handlerton */
+ 	THD*		thd)	/*!< in: MySQL thread handle */
+ 
+ {
+ 	const char*			file_name;
+ 	unsigned long long 	pos;
+ 	mtr_t			mtr;
+ 
+ 	DBUG_ENTER("innobase_store_binlog_info");
+ 
+ 	thd_binlog_pos(thd, &file_name, &pos);
+ 
+ 	mtr_start(&mtr);
+ 
+ 	trx_sys_update_mysql_binlog_offset(file_name, pos,
+ 					   TRX_SYS_MYSQL_LOG_INFO, &mtr);
+ 
+ 	mtr_commit(&mtr);
+ 
+ 	innobase_flush_logs(hton);
+ 
+ 	DBUG_RETURN(0);
+ }
+ #endif
+ 
  /*****************************************************************//**
  Creates an InnoDB transaction struct for the thd if it does not yet have one.
  Starts a new InnoDB transaction if a transaction is not yet started. And
diff --cc storage/xtradb/os/os0file.cc
index 855c500,ea10c6f..d5bd6b4
--- a/storage/xtradb/os/os0file.cc
+++ b/storage/xtradb/os/os0file.cc
@@@ -1496,10 -1485,9 +1496,11 @@@ os_file_create_simple_no_error_handling
  	*success = (file != INVALID_HANDLE_VALUE);
  #else /* __WIN__ */
  	int		create_flag;
+ 	const char*	mode_str	= NULL;
  
  	ut_a(name);
 +	if (create_mode != OS_FILE_OPEN && create_mode != OS_FILE_OPEN_RAW)
 +		WAIT_ALLOW_WRITES();
  
  	ut_a(!(create_mode & OS_FILE_ON_ERROR_SILENT));
  	ut_a(!(create_mode & OS_FILE_ON_ERROR_NO_EXIT));
diff --cc support-files/mysql.server.sh
index 76a0622,be913f7..c9398b6
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@@ -372,11 -351,8 +367,11 @@@ case "$mode" i
    'restart')
      # Stop the service and regardless of whether it was
      # running or not, start it again.
-     if $0 stop  $other_args; then
-       if ! $0 start $other_args; then
+     if $0 stop  "$@"; then
 -      $0 start "$@"
++      if ! $0 start "$@"; then
 +        log_failure_msg "Failed to restart server."
 +        exit 1
 +      fi
      else
        log_failure_msg "Failed to stop running server, so refusing to try to start."
        exit 1


More information about the commits mailing list