BUG#30445128 PRIVILEGE_CHECKS_USER MUST NOT FORCE REQUIRE_ROW_FORMAT TO BE SET

[post-push]

Description/Fix
---------------

1) A condition tying `PRIVILEGE_CHECKS_USER` value with `REQUIRE_ROW_FORMAT` was
   forgotten in `Relay_log_info::read_info` method.

2) The `rpl.rpl_log_info_repository_persistence_require_row` test started to
   fail due to errors exposed by the change in _1)_:

   a) Some of the test-cases were still linking the both options, that is fixed.

   b) A use case testing for the proper value of `REQUIRE_ROW_FORMAT` when
      `PRIVILEGE_CHECKS_USER` is set, was removed. Is now reinstated.

3) Other tests had result content mismatch due to the change in _1)_, fixed now.

RB: 23456
Reviewed-by: Pedro Gomes <[email protected]>
Reviewed-by: Luis Soares <[email protected]>

Author: Pedro Figueiredo

mysql-test/suite/rpl/r/rpl_log_info_repository_persistence.result

@@ -95,7 +95,7 @@ l@calhost
 Occurrences of 'l@calhost' in the input file: 1
 SELECT * FROM performance_schema.replication_applier_configuration;
 CHANNEL_NAME	DESIRED_DELAY	PRIVILEGE_CHECKS_USER	REQUIRE_ROW_FORMAT
-	0	<INVALID>	YES
+	0	<INVALID>	NO
 include/assert.inc [Check entry for default channel "" in performance_schema.replication_applier_configuration]
 START SLAVE FOR CHANNEL "";
 ERROR HY000: Slave failed to initialize relay log info structure from the repository
@@ -131,7 +131,7 @@ localhost
 Occurrences of 'localhost' in the input file: 1
 SELECT * FROM performance_schema.replication_applier_configuration;
 CHANNEL_NAME	DESIRED_DELAY	PRIVILEGE_CHECKS_USER	REQUIRE_ROW_FORMAT
-	0	<INVALID>	YES
+	0	<INVALID>	NO
 include/assert.inc [Check entry for default channel "" in performance_schema.replication_applier_configuration]
 START SLAVE FOR CHANNEL "";
 ERROR HY000: Slave failed to initialize relay log info structure from the repository

mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_require_row.result

@@ -11,17 +11,17 @@ CREATE USER 'replication_applier'@'localhost' IDENTIFIED BY 'password';
 GRANT REPLICATION_APPLIER ON * . * TO 'replication_applier'@'localhost';
 FLUSH PRIVILEGES;
 
-# 1.1. Set REQUIRE_ROW_FORMAT and REQUIRE_ROW_FORMAT to valid values
+# 1.1. Set REQUIRE_ROW_FORMAT to 1
 #      Check the performance_schema table and file repository are correct
 STOP SLAVE;
-CHANGE MASTER TO MASTER_HOST="localhost", REQUIRE_ROW_FORMAT = 1, PRIVILEGE_CHECKS_USER='replication_applier'@'localhost';
+CHANGE MASTER TO MASTER_HOST="localhost", REQUIRE_ROW_FORMAT = 1;
 include/assert.inc [Check that mysql.slave_relay_log_info does not have any entry]
 include/assert.inc [REQUIRE_ROW_FORMAT enabled for default channel "" in performance_schema.replication_applier_configuration]
 include/assert_grep.inc [In the file the field is set to 1]
 
-# 1.2. Set REQUIRE_ROW_FORMAT and REQUIRE_ROW_FORMAT to valid values
+# 1.2. Set REQUIRE_ROW_FORMAT to 0
 #      Check the performance_schema table and file repository are correct
-CHANGE MASTER TO PRIVILEGE_CHECKS_USER=NULL, REQUIRE_ROW_FORMAT = 0;
+CHANGE MASTER TO REQUIRE_ROW_FORMAT = 0;
 include/assert.inc [Check that mysql.slave_relay_log_info does not have any entry]
 include/assert.inc [REQUIRE_ROW_FORMAT disabled for default channel "" in performance_schema.replication_applier_configuration]
 
@@ -35,12 +35,11 @@ include/assert.inc [REQUIRE_ROW_FORMAT disabled for default channel "" in perfor
 
 # 2.2 Upgrade the server while using File repositories
 #     Start the server using a file repository that has a privileged user
-#     REQUIRE_ROW_FORMAT must be 1
+#     REQUIRE_ROW_FORMAT must be 0
 include/rpl_stop_server.inc [server_number=2]
 include/rpl_start_server.inc [server_number=2 parameters: --skip_slave_start]
 include/assert.inc [Check that mysql.slave_relay_log_info does not have any entry]
-include/assert.inc [REQUIRE_ROW_FORMAT enabled for default channel "" in performance_schema.replication_applier_configuration]
-include/assert_grep.inc [In the file the field is set to 1]
+include/assert.inc [REQUIRE_ROW_FORMAT disabled for default channel "" in performance_schema.replication_applier_configuration]
 # Reset the repository to default values
 CHANGE MASTER TO PRIVILEGE_CHECKS_USER=NULL, REQUIRE_ROW_FORMAT = 0;
 include/assert.inc [Check that mysql.slave_relay_log_info does not have any entry]
@@ -57,28 +56,29 @@ include/assert.inc [Check entry for default channel "" in performance_schema.rep
 
 # 3.2 Upgrade the server to Table repositories from File repositories
 #     Start the server using a file repository that has a privileged user
-#     REQUIRE_ROW_FORMAT must be 1
+#     REQUIRE_ROW_FORMAT must be 0
 include/rpl_restart_server.inc [server_number=2 parameters: --relay-log-info-repository=FILE]
 ALTER TABLE mysql.slave_relay_log_info DROP COLUMN Require_row_format;
 include/rpl_stop_server.inc [server_number=2]
 include/rpl_start_server.inc [server_number=2 parameters: --skip_slave_start --relay-log-info-repository=TABLE --upgrade=FORCE]
-include/assert.inc [Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 1]
+include/assert.inc [Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 0]
 include/assert.inc [Check entry for default channel "" in performance_schema.replication_applier_configuration]
 
 # 4.1 Upgrade the server while using Table repositories
 #     Have 3 channels:
 #       1. A channel with no privileged user (ch1)
 #       2. A group_replication channel (group_replication_recovery)
 #       3. A channel with a privileged user (default channel)
-#     REQUIRE_ROW_FORMAT must be 0 for 1). It must be 1 for 2) and 3)
+#     REQUIRE_ROW_FORMAT must be 0 for 1) and 3). It must be 1 for 2)
 CHANGE MASTER TO MASTER_HOST="localhost", MASTER_PORT=12 FOR CHANNEL "ch1" ;
 CHANGE MASTER TO MASTER_USER="root" FOR CHANNEL "group_replication_recovery";
+CHANGE MASTER TO MASTER_HOST="localhost", MASTER_PORT=12, PRIVILEGE_CHECKS_USER = 'replication_applier'@'localhost' FOR CHANNEL "";
 ALTER TABLE mysql.slave_relay_log_info DROP COLUMN Require_row_format;
 UPDATE mysql.slave_relay_log_info SET Number_of_lines = 10;
 include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start --relay-log-info-repository=TABLE --upgrade=FORCE]
 include/assert.inc [Check the number of channels with enabled REQUIRE_ROW_FORMAT]
 include/assert.inc [Check the number of channels with disabled REQUIRE_ROW_FORMAT]
-include/assert.inc [Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 1]
+include/assert.inc [Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 0]
 include/assert.inc [Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 1]
 include/assert.inc [Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 0]
 

mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_row.test

@@ -6,15 +6,12 @@
 # ==== Requirements ====
 #
 #  TC1: Verify that the column is added when doing an upgrade
-#  TC2: On upgrade verify that the value for REQUIRE_ROW_FORMAT is 0 for
-#       channels with no PRIVILEGE_CHECKS_USER
+#  TC2: On upgrade verify that the value for REQUIRE_ROW_FORMAT is 0
 #  TC3: On upgrade verify that the value for REQUIRE_ROW_FORMAT is 1 for
-#       channels with a defined PRIVILEGE_CHECKS_USER
-#  TC4: On upgrade verify that the value for REQUIRE_ROW_FORMAT is 1 for
 #       group replication channels
-#  TC5: Verify that TC2 and TC3  are true when upgrading from/to
+#  TC4: Verify that TC2 and TC3  are true when upgrading from/to
 #       File repositories
-#  TC6: Verify that TC2, TC3 and TC4 are true when upgrading from/to
+#  TC5: Verify that TC2, TC3 and TC4 are true when upgrading from/to
 #       Table repositories
 #
 # ==== Implementation ====
@@ -24,9 +21,9 @@
 #
 # 1. Basic operations with REQUIRE_ROW_FORMAT
 #
-# 1.1. Set REQUIRE_ROW_FORMAT and REQUIRE_ROW_FORMAT to valid values
+# 1.1. Set REQUIRE_ROW_FORMAT to 1
 #      Check the performance_schema table and file repository are correct
-# 1.2. Set REQUIRE_ROW_FORMAT and REQUIRE_ROW_FORMAT to valid values
+# 1.2. Set REQUIRE_ROW_FORMAT to 0
 #      Check the performance_schema table and file repository are correct
 #
 # 2. File to File upgrades
@@ -36,7 +33,7 @@
 #     REQUIRE_ROW_FORMAT must be 0
 # 2.2 Upgrade the server while using File repositories
 #     Start the server using a file repository that has a privileged user
-#     REQUIRE_ROW_FORMAT must be 1
+#     REQUIRE_ROW_FORMAT must be 0
 #
 # 3. File to Table upgrades
 #
@@ -45,7 +42,7 @@
 #     REQUIRE_ROW_FORMAT must be 0
 # 3.2 Upgrade the server to Table repositories from File repositories
 #     Start the server using a file repository that has a privileged user
-#     REQUIRE_ROW_FORMAT must be 1
+#     REQUIRE_ROW_FORMAT must be 0
 #
 # 4. Table to Table upgrades
 #
@@ -54,7 +51,7 @@
 #       1. A channel with no privileged user (ch1)
 #       2. A group_replication channel (group_replication_recovery)
 #       3. A channel with a privileged user (default channel)
-#     REQUIRE_ROW_FORMAT must be 0 for 1). It must be 1 for 2) and 3)
+#     REQUIRE_ROW_FORMAT must be 0 for 1) and 3). It must be 1 for 2)
 #
 # 5. Cleanup
 #
@@ -97,7 +94,7 @@ FLUSH PRIVILEGES;
 
   --let $assert_text = In the file the field is set to 1
   --let $assert_file = $MYSQLD_DATADIR/$rl_info_filename
-  --let $assert_only_after = localhost
+  --let $assert_only_after = ^1\$
   --let $assert_select = 1
   --let $assert_count = 1
   --source include/assert_grep.inc
@@ -123,20 +120,20 @@ END_OF_PROCEDURE
 # 1. Basic operations with REQUIRE_ROW_FORMAT
 
 --echo
---echo # 1.1. Set REQUIRE_ROW_FORMAT and REQUIRE_ROW_FORMAT to valid values
+--echo # 1.1. Set REQUIRE_ROW_FORMAT to 1
 --echo #      Check the performance_schema table and file repository are correct
 
 STOP SLAVE;
 
-CHANGE MASTER TO MASTER_HOST="localhost", REQUIRE_ROW_FORMAT = 1, PRIVILEGE_CHECKS_USER='replication_applier'@'localhost';
+CHANGE MASTER TO MASTER_HOST="localhost", REQUIRE_ROW_FORMAT = 1;
 
 --source $MYSQL_TMP_DIR/check_require_row_format_enabled_in_file_repo.inc
 
 --echo
---echo # 1.2. Set REQUIRE_ROW_FORMAT and REQUIRE_ROW_FORMAT to valid values
+--echo # 1.2. Set REQUIRE_ROW_FORMAT to 0
 --echo #      Check the performance_schema table and file repository are correct
 
-CHANGE MASTER TO PRIVILEGE_CHECKS_USER=NULL, REQUIRE_ROW_FORMAT = 0;
+CHANGE MASTER TO REQUIRE_ROW_FORMAT = 0;
 
 --source $MYSQL_TMP_DIR/check_require_row_format_disabled_in_file_repo.inc
 
@@ -157,14 +154,14 @@ CHANGE MASTER TO PRIVILEGE_CHECKS_USER=NULL, REQUIRE_ROW_FORMAT = 0;
 --echo
 --echo # 2.2 Upgrade the server while using File repositories
 --echo #     Start the server using a file repository that has a privileged user
---echo #     REQUIRE_ROW_FORMAT must be 1
+--echo #     REQUIRE_ROW_FORMAT must be 0
 
 --let $sub_testcase = no_flag_with_priv_user
 --let $rpl_server_restart_parameters = --skip_slave_start
 --let $slave_server_num = 2
 --source extra/rpl_tests/restart_slave_with_custom_relaylog_repo_file.inc
 
---source $MYSQL_TMP_DIR/check_require_row_format_enabled_in_file_repo.inc
+--source $MYSQL_TMP_DIR/check_require_row_format_disabled_in_file_repo.inc
 
 --echo # Reset the repository to default values
 
@@ -198,7 +195,7 @@ ALTER TABLE mysql.slave_relay_log_info DROP COLUMN Require_row_format;
 --echo
 --echo # 3.2 Upgrade the server to Table repositories from File repositories
 --echo #     Start the server using a file repository that has a privileged user
---echo #     REQUIRE_ROW_FORMAT must be 1
+--echo #     REQUIRE_ROW_FORMAT must be 0
 
 --let $rpl_server_number = 2
 --let $rpl_server_parameters = --relay-log-info-repository=FILE
@@ -212,11 +209,11 @@ ALTER TABLE mysql.slave_relay_log_info DROP COLUMN Require_row_format;
 --let $slave_server_num = 2
 --source extra/rpl_tests/restart_slave_with_custom_relaylog_repo_file.inc
 
---let $assert_text = Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 1
---let $assert_cond = [SELECT COUNT(*) FROM mysql.slave_relay_log_info WHERE CHANNEL_NAME="" AND REQUIRE_ROW_FORMAT = 1] = 1
+--let $assert_text = Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 0
+--let $assert_cond = [SELECT COUNT(*) FROM mysql.slave_relay_log_info WHERE CHANNEL_NAME="" AND REQUIRE_ROW_FORMAT = 0] = 1
 --source include/assert.inc
 
---let $count = `SELECT COUNT(*) FROM performance_schema.replication_applier_configuration WHERE REQUIRE_ROW_FORMAT = 'YES'`
+--let $count = `SELECT COUNT(*) FROM performance_schema.replication_applier_configuration WHERE REQUIRE_ROW_FORMAT = 'NO'`
 --let $assert_text = Check entry for default channel "" in performance_schema.replication_applier_configuration
 --let $assert_cond = $count = 1
 --source include/assert.inc
@@ -229,12 +226,13 @@ ALTER TABLE mysql.slave_relay_log_info DROP COLUMN Require_row_format;
 --echo #       1. A channel with no privileged user (ch1)
 --echo #       2. A group_replication channel (group_replication_recovery)
 --echo #       3. A channel with a privileged user (default channel)
---echo #     REQUIRE_ROW_FORMAT must be 0 for 1). It must be 1 for 2) and 3)
+--echo #     REQUIRE_ROW_FORMAT must be 0 for 1) and 3). It must be 1 for 2)
 
 CHANGE MASTER TO MASTER_HOST="localhost", MASTER_PORT=12 FOR CHANNEL "ch1" ;
 --disable_warnings
 CHANGE MASTER TO MASTER_USER="root" FOR CHANNEL "group_replication_recovery";
 --enable_warnings
+CHANGE MASTER TO MASTER_HOST="localhost", MASTER_PORT=12, PRIVILEGE_CHECKS_USER = 'replication_applier'@'localhost' FOR CHANNEL "";
 
 # Revert the table to 10 lines (pre upgrade)
 ALTER TABLE mysql.slave_relay_log_info DROP COLUMN Require_row_format;
@@ -248,16 +246,16 @@ UPDATE mysql.slave_relay_log_info SET Number_of_lines = 10;
 # We have only 1 table here as group_replication_recovery does not show up
 --let $count = `SELECT COUNT(*) FROM performance_schema.replication_applier_configuration WHERE REQUIRE_ROW_FORMAT = 'YES'`
 --let $assert_text = Check the number of channels with enabled REQUIRE_ROW_FORMAT
---let $assert_cond = $count = 1
+--let $assert_cond = $count = 0
 --source include/assert.inc
 
 --let $count = `SELECT COUNT(*) FROM performance_schema.replication_applier_configuration WHERE REQUIRE_ROW_FORMAT = 'NO'`
 --let $assert_text = Check the number of channels with disabled REQUIRE_ROW_FORMAT
---let $assert_cond = $count = 1
+--let $assert_cond = $count = 2
 --source include/assert.inc
 
---let $assert_text = Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 1
---let $assert_cond = [SELECT COUNT(*) FROM mysql.slave_relay_log_info WHERE CHANNEL_NAME="" AND REQUIRE_ROW_FORMAT = 1] = 1
+--let $assert_text = Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 0
+--let $assert_cond = [SELECT COUNT(*) FROM mysql.slave_relay_log_info WHERE CHANNEL_NAME="" AND REQUIRE_ROW_FORMAT = 0] = 1
 --source include/assert.inc
 
 --let $assert_text = Check that mysql.slave_relay_log_info has an entry with REQUIRE_ROW_FORMAT set to 1

sql/rpl_rli.cc

@@ -2134,8 +2134,7 @@ bool Relay_log_info::read_info(Rpl_info_handler *from) {
   if (lines >= LINES_IN_RELAY_LOG_INFO_WITH_REQUIRE_ROW_FORMAT) {
     if (!!from->get_info(&temp_require_row_format, 0)) return true;
   } else {
-    if (username != nullptr ||
-        channel_map.is_group_replication_channel_name(channel))
+    if (channel_map.is_group_replication_channel_name(channel))
       temp_require_row_format = 1;
   }
   m_require_row_format = temp_require_row_format;