Merge branch 'mysql-5.7' into mysql-8.0

vpvenugo · vpvenugo · commit 41d911a7563a · 2019-03-22T11:47:40.000+05:30
diff --git a/mysql-test/extra/rpl_tests/rpl_ignore_super_read_only.test b/mysql-test/extra/rpl_tests/rpl_ignore_super_read_only.test
@@ -16,6 +16,8 @@
 # 11) Execute 'FLUSH BINARY LOGS' command (with GTID_MODE=ON will assert)
 # 12) Execute 'SET GLOBAL gtid_purged='aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1''
 # command
+# 13) Restart Slave and verify that slave_master_info table is updated during
+#     shutdown.
 # 14) Check that replication works fine
 # 15) Restore GLOBAL super_read_only to 0
 #
@@ -27,7 +29,8 @@
 #               MANY RPL CMDS.
 # Bug#26414532: MYSQLRPLSYNC ERRORS OUT BECAUSE SLAVE IS USING --SUPER-READ-ONLY
 #               OPTION
-#
+# Bug#27675107: SUPER_READ_ONLY WITH MASTER_INFO_REPOSITORY=TABLE BREAKS
+#               REPLICATION ON RESTART
 
 if (!$autocommit_opt)
 {
@@ -40,9 +43,9 @@ INSERT INTO t1 VALUES(1);
 DROP TABLE t1;
 --source include/sync_slave_sql_with_master.inc
 
-SET @saved_value_super= @@GLOBAL.super_read_only;
-SET @saved_value= @@GLOBAL.read_only;
-SET @saved_autocommit= @@GLOBAL.autocommit;
+--let $saved_value_super= `SELECT @@GLOBAL.super_read_only`
+--let $saved_value= `SELECT @@GLOBAL.read_only`
+--let $saved_autocommit= `SELECT @@GLOBAL.autocommit`
 SET GLOBAL super_read_only= 1;
 --eval SET AUTOCOMMIT= $autocommit_opt
 SHOW VARIABLES like '%autocommit%';
@@ -114,18 +117,40 @@ RESET MASTER;
 --replace_result $master_uuid MASTER_UUID
 --eval SET GLOBAL gtid_purged= '$master_uuid:1'
 
+--echo ####################################################################
+--echo # Test Case9: Server Restart
+--echo ####################################################################
+
+# Restart Slave and verify that slave_master_info table is updated during shutdown.
+--let $io_pos_before_restart = query_get_value("SHOW SLAVE STATUS", Read_Master_Log_Pos, 1)
+--let $rpl_server_number = 2
+--source include/rpl_restart_server.inc
+--let $io_pos_after_restart = query_get_value("SHOW SLAVE STATUS", Read_Master_Log_Pos, 1)
+
+# Assert that IO thread Read_Master_Log_Pos before and after restart are same.
+--let $assert_text= Read_Master_Log_Pos before and after restart are same.
+--let $assert_cond= $io_pos_before_restart = $io_pos_after_restart
+--source include/assert.inc
+
+# Restart slave threads
+--source include/start_slave.inc
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
 
 --echo "Clean up"
 # Reset slave to clean state
-SET AUTOCOMMIT= @saved_autocommit;
-SET GLOBAL super_read_only= @saved_value_super;
-SET GLOBAL read_only= @saved_value;
+--replace_result $saved_autocommit SAVED_AUTOCOMMIT
+--eval SET AUTOCOMMIT= $saved_autocommit
+--replace_result $saved_value_super SAVED_SUPER_READ_ONLY
+--eval SET GLOBAL super_read_only= $saved_value_super
+--replace_result $saved_value SAVED_READ_ONLY
+--eval SET GLOBAL read_only= $saved_value
 
 # Start fresh slave
 --source include/stop_slave.inc
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 2 ####
---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root';
+--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root'
 --source include/start_slave.inc
 
 --source include/rpl_connection_master.inc
diff --git a/mysql-test/suite/rpl/r/rpl_operation_ignore_super_read_only.result b/mysql-test/suite/rpl/r/rpl_operation_ignore_super_read_only.result
@@ -8,9 +8,6 @@ CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES(1);
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
-SET @saved_value_super= @@GLOBAL.super_read_only;
-SET @saved_value= @@GLOBAL.read_only;
-SET @saved_autocommit= @@GLOBAL.autocommit;
 SET GLOBAL super_read_only= 1;
 SET AUTOCOMMIT= ON;
 SHOW VARIABLES like '%autocommit%';
@@ -56,12 +53,20 @@ RESET MASTER;
 # Test Case8: SET GLOBAL GTID_PURGED command
 ####################################################################
 SET GLOBAL gtid_purged= 'MASTER_UUID:1';
+####################################################################
+# Test Case9: Server Restart
+####################################################################
+include/rpl_restart_server.inc [server_number=2]
+include/assert.inc [Read_Master_Log_Pos before and after restart are same.]
+include/start_slave.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
 "Clean up"
-SET AUTOCOMMIT= @saved_autocommit;
-SET GLOBAL super_read_only= @saved_value_super;
-SET GLOBAL read_only= @saved_value;
+SET AUTOCOMMIT= SAVED_AUTOCOMMIT;
+SET GLOBAL super_read_only= SAVED_SUPER_READ_ONLY;
+SET GLOBAL read_only= SAVED_READ_ONLY;
 include/stop_slave.inc
-CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root';;
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root';
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
@@ -74,9 +79,6 @@ CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES(1);
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
-SET @saved_value_super= @@GLOBAL.super_read_only;
-SET @saved_value= @@GLOBAL.read_only;
-SET @saved_autocommit= @@GLOBAL.autocommit;
 SET GLOBAL super_read_only= 1;
 SET AUTOCOMMIT= OFF;
 SHOW VARIABLES like '%autocommit%';
@@ -122,12 +124,20 @@ RESET MASTER;
 # Test Case8: SET GLOBAL GTID_PURGED command
 ####################################################################
 SET GLOBAL gtid_purged= 'MASTER_UUID:1';
+####################################################################
+# Test Case9: Server Restart
+####################################################################
+include/rpl_restart_server.inc [server_number=2]
+include/assert.inc [Read_Master_Log_Pos before and after restart are same.]
+include/start_slave.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
 "Clean up"
-SET AUTOCOMMIT= @saved_autocommit;
-SET GLOBAL super_read_only= @saved_value_super;
-SET GLOBAL read_only= @saved_value;
+SET AUTOCOMMIT= SAVED_AUTOCOMMIT;
+SET GLOBAL super_read_only= SAVED_SUPER_READ_ONLY;
+SET GLOBAL read_only= SAVED_READ_ONLY;
 include/stop_slave.inc
-CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root';;
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root';
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
diff --git a/mysql-test/suite/rpl/t/rpl_operation_ignore_super_read_only.test b/mysql-test/suite/rpl/t/rpl_operation_ignore_super_read_only.test
@@ -19,7 +19,8 @@
 #               MANY RPL CMDS.
 # Bug#26414532: MYSQLRPLSYNC ERRORS OUT BECAUSE SLAVE IS USING --SUPER-READ-ONLY
 #               OPTION
-#
+# Bug#27675107: SUPER_READ_ONLY WITH MASTER_INFO_REPOSITORY=TABLE BREAKS
+#               REPLICATION ON RESTART
 
 # Test in this file only makes sense in standard replication,
 # so it is skipped in group replication.
diff --git a/sql/rpl_info_table.cc b/sql/rpl_info_table.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -160,7 +160,7 @@ int Rpl_info_table::do_init_info(enum_find_method method, uint instance) {
   /*
     Unlocks and closes the rpl_info table.
   */
-  access->close_table(thd, table, &backup, error);
+  error = access->close_table(thd, table, &backup, error) || error;
   thd->variables.sql_mode = saved_mode;
   thd->variables.option_bits = saved_options;
   access->drop_thd(thd);
@@ -260,7 +260,7 @@ int Rpl_info_table::do_flush_info(const bool force) {
   /*
     Unlocks and closes the rpl_info table.
   */
-  access->close_table(thd, table, &backup, error);
+  error = access->close_table(thd, table, &backup, error) || error;
   thd->is_operating_substatement_implicitly = false;
   thd->variables.sql_mode = saved_mode;
   thd->variables.option_bits = saved_options;
@@ -310,7 +310,7 @@ int Rpl_info_table::do_clean_info() {
   /*
     Unlocks and closes the rpl_info table.
   */
-  access->close_table(thd, table, &backup, error);
+  error = access->close_table(thd, table, &backup, error) || error;
   thd->variables.sql_mode = saved_mode;
   thd->variables.option_bits = saved_options;
   access->drop_thd(thd);
@@ -404,7 +404,7 @@ int Rpl_info_table::do_reset_info(uint nparam, const char *param_schema,
   /*
     Unlocks and closes the rpl_info table.
   */
-  info->access->close_table(thd, table, &backup, error);
+  error = info->access->close_table(thd, table, &backup, error) || error;
   thd->variables.sql_mode = saved_mode;
   thd->variables.option_bits = saved_options;
   info->access->drop_thd(thd);
@@ -560,7 +560,7 @@ bool Rpl_info_table::do_count_info(uint nparam, const char *param_schema,
   /*
     Unlocks and closes the rpl_info table.
   */
-  info->access->close_table(thd, table, &backup, error);
+  error = info->access->close_table(thd, table, &backup, error) || error;
   thd->variables.sql_mode = saved_mode;
   info->access->drop_thd(thd);
   delete info;
@@ -715,7 +715,7 @@ bool Rpl_info_table::do_update_is_transactional() {
   error = false;
 
 end:
-  access->close_table(thd, table, &backup, 0);
+  error = access->close_table(thd, table, &backup, 0) || error;
   thd->variables.sql_mode = saved_mode;
   thd->variables.option_bits = saved_options;
   access->drop_thd(thd);
diff --git a/sql/rpl_info_table_access.cc b/sql/rpl_info_table_access.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -94,12 +94,17 @@ void Rpl_info_table_access::before_open(THD *thd) {
   committed. In this case, the changes were not done on behalf of
   any user transaction and if not finished, there would be pending
   changes.
+
+  @return
+    @retval false Success
+    @retval true  Failure
 */
-void Rpl_info_table_access::close_table(THD *thd, TABLE *table,
+bool Rpl_info_table_access::close_table(THD *thd, TABLE *table,
                                         Open_tables_backup *backup,
                                         bool error) {
   DBUG_ENTER("Rpl_info_table_access::close_table");
-  System_table_access::close_table(thd, table, backup, error, thd_created);
+  bool res =
+      System_table_access::close_table(thd, table, backup, error, thd_created);
 
   DBUG_EXECUTE_IF("slave_crash_after_commit_no_atomic_ddl", {
     if (thd->slave_thread && thd->rli_slave && thd->rli_slave->current_event &&
@@ -112,7 +117,7 @@ void Rpl_info_table_access::close_table(THD *thd, TABLE *table,
     }
   });
 
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(res);
 }
 
 /**
@@ -355,6 +360,11 @@ THD *Rpl_info_table_access::create_thd() {
   if (!thd) {
     thd = System_table_access::create_thd();
     thd->system_thread = SYSTEM_THREAD_INFO_REPOSITORY;
+    /*
+       Set the skip_readonly_check flag as this thread should not be
+       blocked by super_read_only check during ha_commit_trans.
+    */
+    thd->set_skip_readonly_check();
     thd_created = true;
   }
 
@@ -371,6 +381,7 @@ void Rpl_info_table_access::drop_thd(THD *thd) {
   DBUG_ENTER("Rpl_info::drop_thd");
 
   if (thd_created) {
+    thd->reset_skip_readonly_check();
     System_table_access::drop_thd(thd);
     thd_created = false;
   }
diff --git a/sql/rpl_info_table_access.h b/sql/rpl_info_table_access.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -48,7 +48,7 @@ class Rpl_info_table_access : public System_table_access {
     @param[in]  thd  Thread requesting to open the table
   */
   void before_open(THD *thd);
-  void close_table(THD *thd, TABLE *table, Open_tables_backup *backup,
+  bool close_table(THD *thd, TABLE *table, Open_tables_backup *backup,
                    bool error);
   enum enum_return_id find_info(Rpl_info_values *field_values, TABLE *table);
   enum enum_return_id scan_info(TABLE *table, uint instance);
diff --git a/sql/rpl_table_access.cc b/sql/rpl_table_access.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -122,13 +122,13 @@ bool System_table_access::close_table(THD *thd, TABLE *table,
     }
     if (need_commit) {
       if (error)
-        res = ha_rollback_trans(thd, true);
+        res = ha_rollback_trans(thd, true) || res;
       else {
         /*
           To make the commit not to block with global read lock set
           "ignore_global_read_lock" flag to true.
          */
-        res = ha_commit_trans(thd, true, true);
+        res = ha_commit_trans(thd, true, true) || res;
       }
     }
     /*
