Bug#22102456 ENABLING GTID AT STARTUP RESULTS IN UNNECESSARY GTID SETS

Problem:

When a server is initialized with GTID enabled, it creates a large and
unnecessary GTID set.

Fix:

Disabled binary logging session option when applying compiled bootstrap
statements.

Author: Joao Gramacho

mysql-test/r/initialize_gtid.result

@@ -0,0 +1,12 @@
+CALL mtr.add_suppression("InnoDB:");
+USE mysql;
+# Shut server down
+# Server is down
+# Run the server with:
+#   --initialize-insecure
+#   --explicit_defaults_for_timestamp --gtid-mode=on --enforce-gtid-consistency=on --log-bin=mysql-bin --server-id=1
+# Restart the server against DDIR
+# Connect as root
+include/assert.inc [GTID_EXECUTED should be empty after initialization]
+# Clean up
+# Restarting the server after cleaning it up

mysql-test/t/initialize_gtid.test

@@ -0,0 +1,69 @@
+# ==== Purpose ====
+#
+# This test will initialize a new instance of a mysql server enabling binary
+# logging and GTID features. After the server initialization, the test case
+# will connect to the new server and no GTIDs are expected to be generated
+# during the initialization (GTID_EXECUTED should be empty).
+#
+# ==== Related Bugs and Worklogs ====
+#
+# Bug#22102456 ENABLING GTID AT STARTUP RESULTS IN UNNECESSARY GTID SETS
+#
+
+--source include/not_embedded.inc
+--source include/have_no_undo_tablespaces.inc
+
+--let BASEDIR= `select @@basedir`
+--let DDIR=$MYSQL_TMP_DIR/installdb_test
+--let MYSQLD_LOG=$MYSQL_TMP_DIR/server.log
+--let extra_args=--no-defaults --console --log-syslog=0 --loose-skip-auto_generate_certs --loose-skip-sha256_password_auto_generate_rsa_keys --skip-ssl --basedir=$BASEDIR --lc-messages-dir=$MYSQL_SHAREDIR
+--let init_args=--explicit_defaults_for_timestamp --gtid-mode=on --enforce-gtid-consistency=on --log-bin=mysql-bin --server-id=1
+--let BOOTSTRAP_SQL=$MYSQL_TMP_DIR/tiny_bootstrap.sql
+#--let PASSWD_FILE=$MYSQL_TMP_DIR/password_file.txt
+
+# We don't care about innodb warnings at this point
+CALL mtr.add_suppression("InnoDB:");
+USE mysql;
+
+--echo # Shut server down
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--echo # Server is down
+
+--echo # Run the server with:
+--echo #   --initialize-insecure
+--echo #   $init_args
+--exec $MYSQLD $extra_args --initialize-insecure --datadir=$DDIR $init_args > $MYSQLD_LOG 2>&1
+
+--echo # Restart the server against DDIR
+--exec echo "restart:--datadir=$DDIR $init_args" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--echo # Connect as root
+connect(root_con,localhost,root,,mysql);
+
+--let $assert_text= GTID_EXECUTED should be empty after initialization
+--let $assert_cond= @@GLOBAL.GTID_EXECUTED = ""
+--source include/assert.inc
+
+--echo # Clean up
+# Shut server down
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+# Delete mysqld log
+remove_file $MYSQLD_LOG;
+# Delete datadir
+--perl
+use File::Path 'rmtree';
+$DDIR=$ENV{"DDIR"};
+rmtree([ "$DDIR" ]);
+EOF
+
+--echo # Restarting the server after cleaning it up
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc

sql/bootstrap.cc

@@ -101,9 +101,17 @@ static void handle_bootstrap_impl(THD *thd)
   thd->init_for_queries();
 
   if (opt_initialize)
+  {
     Command_iterator::current_iterator= &comp_iter;
+    /* Disable binary logging during compiled statements */
+    thd->variables.option_bits&= ~OPTION_BIN_LOG;
+  }
   else
+  {
     Command_iterator::current_iterator= &file_iter;
+    /* Re-enable binary logging during init-file statements */
+    thd->variables.option_bits|= OPTION_BIN_LOG;
+  }
 
   Command_iterator::current_iterator->begin();
   for ( ; ; )