Merge branch 'mysql-5.7' into mysql-8.0

Author: Shishir Jaiswal

mysql-test/collections/disabled-asan.list

@@ -5,3 +5,4 @@ main.dd_bootstrap                            : Bug#24421481 2016-08-08 edahl
 binlog.binlog_check_flush_log_assertion      : Bug#22732184 2017-03-10 edahl
 innodb.virtual_basic                         : Bug#25431979 2017-03-27 edahl
 rpl.rpl_json                                 : Bug#25873029 2017-05-03 edahl
+main.mysqlpump_partial_bkp                   : Bug#26199978 2017-11-13 shisjais

mysql-test/r/mysqlpump_extended.result

@@ -368,23 +368,3 @@ INSERT INTO t1 VALUES (x)	utf8mb4	utf8mb4_0900_ai_ci	utf8mb4_0900_ai_ci
 DROP DATABASE db1_extended;
 DROP USER u1@localhost;
 # test for compress-output
-#
-# Bug#26199978 - WRONG ERROR MESSAGE FOR PARTIAL BACKUPS WITH GTID_MODE = ON
-#
-# Test 1: Taking backup when --set-gtid-purged is passed as ON
-CREATE DATABASE bug26199978;
-DROP DATABASE bug26199978;
-# Backup file should contain "SET @@GLOBAL.GTID_PURGED=.* '.*'"
-Pattern "SET @@GLOBAL.GTID_PURGED=.* '.*'" found
-# Test 2: Taking backup when --set-gtid-purged is pased as OFF
-CREATE DATABASE bug26199978;
-DROP DATABASE bug26199978;
-# Backup file should NOT contain "SET @@GLOBAL.GTID_PURGED=.* '.*'"
-Matching lines are:
-None
-Occurrences of 'SET @@GLOBAL.GTID_PURGED=.* '.*'' in the input file: 0
-# Test 3: Taking backup when --set-gtid-purged is passed as AUTO. Should error out
-#         asking to pass --set-gtid-purged=[ON|OFF]
-CREATE DATABASE bug26199978;
-DROP DATABASE bug26199978;
-# Cleanup

mysql-test/r/mysqlpump_partial_bkp.result

@@ -0,0 +1,20 @@
+#
+# Bug#26199978 - WRONG ERROR MESSAGE FOR PARTIAL BACKUPS WITH GTID_MODE = ON
+#
+# Test 1: Taking backup when --set-gtid-purged is passed as ON
+CREATE DATABASE bug26199978;
+DROP DATABASE bug26199978;
+# Backup file should contain "SET @@GLOBAL.GTID_PURGED=.* '.*'"
+Pattern "SET @@GLOBAL.GTID_PURGED=.* '.*'" found
+# Test 2: Taking backup when --set-gtid-purged is pased as OFF
+CREATE DATABASE bug26199978;
+DROP DATABASE bug26199978;
+# Backup file should NOT contain "SET @@GLOBAL.GTID_PURGED=.* '.*'"
+Matching lines are:
+None
+Occurrences of 'SET @@GLOBAL.GTID_PURGED=.* '.*'' in the input file: 0
+# Test 3: Taking backup when --set-gtid-purged is passed as AUTO. Should error out
+#         asking to pass --set-gtid-purged=[ON|OFF]
+CREATE DATABASE bug26199978;
+DROP DATABASE bug26199978;
+# Cleanup

mysql-test/t/mysqlpump_extended.test

@@ -426,43 +426,3 @@ DROP USER u1@localhost;
 #cleanup
 --remove_file $MYSQLTEST_VARDIR/tmp/db1_extended.zlib
 --remove_file $MYSQLTEST_VARDIR/tmp/db1_extended.lz4
-
--- echo #
--- echo # Bug#26199978 - WRONG ERROR MESSAGE FOR PARTIAL BACKUPS WITH GTID_MODE = ON
--- echo #
-
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---shutdown_server 10
---source include/wait_until_disconnected.inc
---enable_reconnect
---exec echo "restart: --enforce-gtid-consistency=ON --gtid-mode=ON" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---source include/wait_until_connected_again.inc
-
-let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/bug26199978_gtid-purged_ON.sql;
-let SEARCH_PATTERN=SET @@GLOBAL.GTID_PURGED=.* '.*';
-let GREP_FILE=$MYSQLTEST_VARDIR/tmp/bug26199978_gtid-purged_OFF.sql;
-let GREP_PATTERN=$SEARCH_PATTERN;
-
---echo # Test 1: Taking backup when --set-gtid-purged is passed as ON
-CREATE DATABASE bug26199978;
---exec $MYSQL_PUMP --databases bug26199978 --set-gtid-purged=ON > $SEARCH_FILE
-DROP DATABASE bug26199978;
---echo # Backup file should contain "$SEARCH_PATTERN"
---source include/search_pattern.inc
-
---echo # Test 2: Taking backup when --set-gtid-purged is pased as OFF
-CREATE DATABASE bug26199978;
---exec $MYSQL_PUMP --databases bug26199978 --set-gtid-purged=OFF > $GREP_FILE
-DROP DATABASE bug26199978;
---echo # Backup file should NOT contain "$GREP_PATTERN"
---source include/grep_pattern.inc
-
---echo # Test 3: Taking backup when --set-gtid-purged is passed as AUTO. Should error out
---echo #         asking to pass --set-gtid-purged=[ON|OFF]
-CREATE DATABASE bug26199978;
---error 1
---exec $MYSQL_PUMP --databases bug26199978 --set-gtid-purged=AUTO > $MYSQLTEST_VARDIR/tmp/bug26199978_auto.sql
-DROP DATABASE bug26199978;
-
---echo # Cleanup
---remove_files_wildcard $MYSQLTEST_VARDIR/tmp bug26199978_*.sql

mysql-test/t/mysqlpump_partial_bkp.test

@@ -0,0 +1,41 @@
+--source include/not_valgrind.inc
+
+--echo #
+--echo # Bug#26199978 - WRONG ERROR MESSAGE FOR PARTIAL BACKUPS WITH GTID_MODE = ON
+--echo #
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart: --enforce-gtid-consistency=ON --gtid-mode=ON" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/bug26199978_gtid-purged_ON.sql;
+let SEARCH_PATTERN=SET @@GLOBAL.GTID_PURGED=.* '.*';
+let GREP_FILE=$MYSQLTEST_VARDIR/tmp/bug26199978_gtid-purged_OFF.sql;
+let GREP_PATTERN=$SEARCH_PATTERN;
+
+--echo # Test 1: Taking backup when --set-gtid-purged is passed as ON
+CREATE DATABASE bug26199978;
+--exec $MYSQL_PUMP --databases bug26199978 --set-gtid-purged=ON > $SEARCH_FILE
+DROP DATABASE bug26199978;
+--echo # Backup file should contain "$SEARCH_PATTERN"
+--source include/search_pattern.inc
+
+--echo # Test 2: Taking backup when --set-gtid-purged is pased as OFF
+CREATE DATABASE bug26199978;
+--exec $MYSQL_PUMP --databases bug26199978 --set-gtid-purged=OFF > $GREP_FILE
+DROP DATABASE bug26199978;
+--echo # Backup file should NOT contain "$GREP_PATTERN"
+--source include/grep_pattern.inc
+
+--echo # Test 3: Taking backup when --set-gtid-purged is passed as AUTO. Should error out
+--echo #         asking to pass --set-gtid-purged=[ON|OFF]
+CREATE DATABASE bug26199978;
+--error 1
+--exec $MYSQL_PUMP --databases bug26199978 --set-gtid-purged=AUTO > $MYSQLTEST_VARDIR/tmp/bug26199978_auto.sql
+DROP DATABASE bug26199978;
+
+--echo # Cleanup
+--remove_files_wildcard $MYSQLTEST_VARDIR/tmp bug26199978_*.sql