diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_index.test | 6 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_checksum.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_rotate_logs.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysqlbinlog.test | 1 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 21 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 | ||||
| -rwxr-xr-x | support-files/build-tags | 17 |
9 files changed, 37 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore index 51ea42b2956..fc97ceb325e 100644 --- a/.gitignore +++ b/.gitignore @@ -175,6 +175,10 @@ storage/tokudb/ft-index/ft/log_code.cc storage/tokudb/ft-index/ft/log_header.h storage/tokudb/ft-index/ft/log_print.cc storage/tokudb/ft-index/ft/logformat +storage/tokudb/ft-index/ft/ftverify +storage/tokudb/ft-index/ft/tdb-recover +storage/tokudb/ft-index/ft/tdb_logprint +storage/tokudb/ft-index/ft/tokuftdump storage/tokudb/ft-index/portability/merge_archives_tokuportability_static.cmake storage/tokudb/ft-index/portability/toku_config.h storage/tokudb/ft-index/portability/tokuportability_static_depends.cc diff --git a/mysql-test/suite/binlog/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test index a264549ce17..26f3595db2b 100644 --- a/mysql-test/suite/binlog/t/binlog_index.test +++ b/mysql-test/suite/binlog/t/binlog_index.test @@ -37,6 +37,7 @@ flush tables; # there must be a warning with file names replace_regex /\.[\\\/]master/master/; +--source include/wait_for_binlog_checkpoint.inc purge binary logs TO 'master-bin.000004'; --echo *** must show a list starting from the 'TO' argument of PURGE *** @@ -57,6 +58,7 @@ remove_file $MYSQLD_DATADIR/master-bin.000001; let $date=`select NOW() + INTERVAL 1 MINUTE`; --disable_query_log replace_regex /\.[\\\/]master/master/; +--source include/wait_for_binlog_checkpoint.inc eval purge binary logs BEFORE '$date'; --enable_query_log @@ -77,6 +79,7 @@ flush logs; remove_file $MYSQLD_DATADIR/master-bin.000001; mkdir $MYSQLD_DATADIR/master-bin.000001; +--source include/wait_for_binlog_checkpoint.inc --error ER_BINLOG_PURGE_FATAL_ERR purge binary logs TO 'master-bin.000002'; replace_regex /\.[\\\/]master/master/; @@ -91,6 +94,7 @@ flush logs; --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect SET SESSION debug_dbug="+d,crash_purge_before_update_index"; +--source include/wait_for_binlog_checkpoint.inc --error 2013 purge binary logs TO 'master-bin.000002'; @@ -111,6 +115,7 @@ flush logs; --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index"; +--source include/wait_for_binlog_checkpoint.inc --error 2013 purge binary logs TO 'master-bin.000004'; @@ -134,6 +139,7 @@ flush logs; --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index"; +--source include/wait_for_binlog_checkpoint.inc --error 2013 purge binary logs TO 'master-bin.000006'; diff --git a/mysql-test/suite/rpl/t/rpl_checksum.test b/mysql-test/suite/rpl/t/rpl_checksum.test index bd0ab7ecc9c..ff7d2801911 100644 --- a/mysql-test/suite/rpl/t/rpl_checksum.test +++ b/mysql-test/suite/rpl/t/rpl_checksum.test @@ -95,6 +95,7 @@ source include/stop_slave.inc; connection master; set @@global.binlog_checksum = CRC32; +-- source include/wait_for_binlog_checkpoint.inc insert into t1 values (1) /* will not be applied on slave due to simulation */; # instruction to the dump thread diff --git a/mysql-test/suite/rpl/t/rpl_rotate_logs.test b/mysql-test/suite/rpl/t/rpl_rotate_logs.test index 273786cf807..358c0be5b3b 100644 --- a/mysql-test/suite/rpl/t/rpl_rotate_logs.test +++ b/mysql-test/suite/rpl/t/rpl_rotate_logs.test @@ -109,6 +109,7 @@ source include/show_master_logs.inc; # we just tests if synonyms are accepted purge binary logs to 'master-bin.000002'; source include/show_binary_logs.inc; +--source include/wait_for_binlog_checkpoint.inc # Set the purge time 1 second after the last modify time of master-bin.000002. perl; diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index e167893fb9f..e5bc36f6851 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -551,6 +551,7 @@ DROP TABLE t1; DROP DATABASE test1; let $master_binlog= query_get_value(SHOW MASTER STATUS, File, 1); FLUSH LOGS; +--source include/wait_for_binlog_checkpoint.inc let $MYSQLD_DATADIR= `SELECT @@datadir`; exec $MYSQL_BINLOG $MYSQLD_DATADIR/$master_binlog | $MYSQL test 2>&1; diff --git a/sql/set_var.cc b/sql/set_var.cc index faeabcd074f..e994745db68 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1152,7 +1152,7 @@ end: void mark_sys_var_value_origin(void *ptr, enum sys_var::where here) { - bool found= false; + bool found __attribute__((unused))= false; DBUG_ASSERT(!mysqld_server_started); // only to be used during startup for (uint i= 0; i < system_variable_hash.records; i++) diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 2a92bef4cf6..1ee443cfb83 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2763,12 +2763,20 @@ bool change_password(THD *thd, LEX_USER *user) enum_binlog_format save_binlog_format; int result=0; const CSET_STRING query_save __attribute__((unused)) = thd->query_string; - DBUG_ENTER("change_password"); DBUG_PRINT("enter",("host: '%s' user: '%s' new_password: '%s'", user->host.str, user->user.str, user->password.str)); DBUG_ASSERT(user->host.str != 0); // Ensured by parent + /* + This statement will be replicated as a statement, even when using + row-based replication. The flag will be reset at the end of the + statement. + This has to be handled here as it's called by set_var.cc, which is + not automaticly handled by sql_parse.cc + */ + save_binlog_format= thd->set_current_stmt_binlog_format_stmt(); + if (mysql_bin_log.is_open() || (WSREP(thd) && !IF_WSREP(thd->wsrep_applier, 0))) { @@ -2788,15 +2796,6 @@ bool change_password(THD *thd, LEX_USER *user) result= 1; - /* - This statement will be replicated as a statement, even when using - row-based replication. The flag will be reset at the end of the - statement. - This has to be handled here as it's called by set_var.cc, which is - not automaticly handled by sql_parse.cc - */ - save_binlog_format= thd->set_current_stmt_binlog_format_stmt(); - mysql_mutex_lock(&acl_cache->lock); ACL_USER *acl_user; if (!(acl_user= find_user_exact(user->host.str, user->user.str))) @@ -2842,7 +2841,7 @@ end: close_mysql_tables(thd); #ifdef WITH_WSREP -error: // this label is used in WSREP_TO_ISOLATION_END +error: // this label is used in WSREP_TO_ISOLATION_BEGIN if (WSREP(thd) && !thd->wsrep_applier) { WSREP_TO_ISOLATION_END; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 90c3110b63a..87e2206cfb5 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -23786,7 +23786,7 @@ int JOIN::save_explain_data_intern(Explain_query *output, bool need_tmp_table, bool need_order, bool distinct, const char *message) { - Explain_node *explain_node; + Explain_node *explain_node= 0; JOIN *join= this; /* Legacy: this code used to be a non-member function */ int error= 0; DBUG_ENTER("JOIN::save_explain_data_intern"); diff --git a/support-files/build-tags b/support-files/build-tags index 44bd2a02593..87f320ba5f5 100755 --- a/support-files/build-tags +++ b/support-files/build-tags @@ -1,9 +1,16 @@ #! /bin/sh rm -f TAGS -filter='\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.ic$\|errmsg-utf8\.txt$' -list="find . -type f" -bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned" - -$list |grep $filter | xargs etags -o TAGS --append +if git rev-parse HEAD >/dev/null 2>&1 +then + cd `git rev-parse --show-toplevel` + echo client storage dbug libmysql sql-common \ + sql extra mysys mysys_ssl strings regex pcre vio include \ + tools unittest plugin libmysqld | \ + xargs -n1 git ls-files | \ + xargs etags -o TAGS --append +else + find . -type f | + xargs etags -o TAGS --append +fi |