Merge branch 'mysql-8.0' into mysql-trunk

Author: Justin Jose

mysql-test/r/upgrade_system_tables.result

@@ -50,10 +50,6 @@ include/filter_file.inc
 ########################################################################
 
 # Compare fresh and upgraded tables
-20c20
-< #	#	gtid_executed	BASE TABLE	InnoDB	#	Dynamic	255		Visible	avg_row_length=0;encrypt_type=N;explicit_tablespace=1;key_block_size=0;keys_disabled=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_sample_pages=0;	#	#	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	NULL
----
-> #	#	gtid_executed	BASE TABLE	InnoDB	#	Dynamic	255		Visible	avg_row_length=0;encrypt_type=N;explicit_tablespace=1;key_block_size=0;keys_disabled=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0;	#	#	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	NULL
 
 # Compare fresh and upgraded columns
 

mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json

@@ -40281,7 +40281,7 @@
         "created": NNN,
         "last_altered": NNN,
         "hidden": 1,
-        "options": "avg_row_length=0;encrypt_type=N;explicit_tablespace=1;key_block_size=0;keys_disabled=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_sample_pages=0;",
+        "options": "avg_row_length=0;encrypt_type=N;explicit_tablespace=1;key_block_size=0;keys_disabled=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0;",
         "columns": [
             {
                 "name": "source_uuid",

mysql-test/suite/rpl_gtid/r/rpl_gtids_table.result

@@ -12,7 +12,7 @@ gtid_executed	CREATE TABLE `gtid_executed` (
   `interval_start` bigint NOT NULL COMMENT 'First number of interval.',
   `interval_end` bigint NOT NULL COMMENT 'Last number of interval.',
   PRIMARY KEY (`source_uuid`,`interval_start`)
-) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC
 #
 # Verify that the specified gtid to GTID_NEXT can be reported from
 # global.gtid_executed and is stored into gtid_executed table on

mysql-test/t/upgrade_system_tables.test

@@ -139,9 +139,7 @@
 
 --echo
 --echo # Compare fresh and upgraded tables
-# TODO : Replace with --diff_files after Bug#32250735 is fixed
---error 0,1
---exec diff $tables_fresh_datadir $tables_upgraded_datadir
+--diff_files $tables_fresh_datadir $tables_upgraded_datadir
 
 --echo
 --echo # Compare fresh and upgraded columns

scripts/mysql_system_tables.sql

@@ -421,7 +421,7 @@ SET @cmd= "CREATE TABLE IF NOT EXISTS gtid_executed (
     source_uuid CHAR(36) NOT NULL COMMENT 'uuid of the source where the transaction was originally executed.',
     interval_start BIGINT NOT NULL COMMENT 'First number of interval.',
     interval_end BIGINT NOT NULL COMMENT 'Last number of interval.',
-    PRIMARY KEY(source_uuid, interval_start))";
+    PRIMARY KEY(source_uuid, interval_start)) STATS_PERSISTENT=0";
 
 SET @str=IF(@have_innodb <> 0, CONCAT(@cmd, ' ENGINE= INNODB ROW_FORMAT=DYNAMIC TABLESPACE=mysql ENCRYPTION=\'', @is_mysql_encrypted,'\''), CONCAT(@cmd, ' ENGINE= MYISAM'));
 PREPARE stmt FROM @str;