Skip to content

Commit 57947a8

Browse files
thayumanavar77thayumanavar77
committed
BUG#22926223 - DB CANNOT BE PROPERLY INITIALIZED
 INNODB-DEFAULT-ROW-FORMAT=COMPACT 4K PAGE SIZE When db is initialized with default innodb row format as compact and page size 4K, initialization aborts because the column type sizes doesn't fit in the compact row format for some DD tables. The fix specifies row format dynamic for routines, parameters and events DD tables. In addition, all new DD tables that are created as part of DB initialization is specified the row format dynamic explicitly.
1 parent ba597ce commit 57947a8

24 files changed

+58
-36
lines changed

‎mysql-test/r/dd_schema_definition_ci.result

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,26 @@ AND name IN ('innodb_table_stats',
3131
'version'))
3232
ORDER BY id;
3333
id name type engine collation_id comment hidden options se_private_data se_private_id tablespace_id
34-
1 version BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=0;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 11 NULL
35-
3 collations BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 13 NULL
36-
4 tablespaces BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 14 NULL
37-
5 tablespace_files BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 15 NULL
38-
6 catalogs BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 16 NULL
39-
7 schemata BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 17 NULL
40-
8 tables BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 18 NULL
41-
9 view_table_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 19 NULL
42-
10 columns BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 20 NULL
43-
11 indexes BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 21 NULL
44-
12 index_column_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=0;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 22 NULL
45-
13 column_type_elements BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 23 NULL
46-
14 foreign_keys BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 24 NULL
47-
15 foreign_key_column_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 25 NULL
48-
16 table_partitions BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 26 NULL
49-
17 table_partition_values BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 27 NULL
50-
18 index_partitions BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 28 NULL
34+
1 version BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=0;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 11 NULL
35+
3 collations BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 13 NULL
36+
4 tablespaces BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 14 NULL
37+
5 tablespace_files BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 15 NULL
38+
6 catalogs BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 16 NULL
39+
7 schemata BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 17 NULL
40+
8 tables BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 18 NULL
41+
9 view_table_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 19 NULL
42+
10 columns BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 20 NULL
43+
11 indexes BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 21 NULL
44+
12 index_column_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=0;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 22 NULL
45+
13 column_type_elements BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 23 NULL
46+
14 foreign_keys BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 24 NULL
47+
15 foreign_key_column_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 25 NULL
48+
16 table_partitions BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 26 NULL
49+
17 table_partition_values BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 27 NULL
50+
18 index_partitions BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 28 NULL
5151
23 innodb_table_stats BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 33 NULL
5252
24 innodb_index_stats BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 34 NULL
53-
25 character_sets BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL NULL NULL
53+
25 character_sets BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL NULL NULL
5454
#
5555
# Subset of definitions from columns, not including
5656
# default_values.

‎mysql-test/r/dd_schema_definition_cs.result

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,26 @@ AND name IN ('innodb_table_stats',
3131
'version'))
3232
ORDER BY id;
3333
id name type engine collation_id comment hidden options se_private_data se_private_id tablespace_id
34-
1 version BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=0;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 11 NULL
35-
3 collations BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 13 NULL
36-
4 tablespaces BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 14 NULL
37-
5 tablespace_files BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 15 NULL
38-
6 catalogs BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 16 NULL
39-
7 schemata BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 17 NULL
40-
8 tables BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 18 NULL
41-
9 view_table_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 19 NULL
42-
10 columns BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 20 NULL
43-
11 indexes BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 21 NULL
44-
12 index_column_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=0;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 22 NULL
45-
13 column_type_elements BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 23 NULL
46-
14 foreign_keys BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 24 NULL
47-
15 foreign_key_column_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 25 NULL
48-
16 table_partitions BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 26 NULL
49-
17 table_partition_values BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 27 NULL
50-
18 index_partitions BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 28 NULL
34+
1 version BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 11 NULL
35+
3 collations BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 13 NULL
36+
4 tablespaces BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 14 NULL
37+
5 tablespace_files BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 15 NULL
38+
6 catalogs BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 16 NULL
39+
7 schemata BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 17 NULL
40+
8 tables BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 18 NULL
41+
9 view_table_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 19 NULL
42+
10 columns BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 20 NULL
43+
11 indexes BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 21 NULL
44+
12 index_column_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 22 NULL
45+
13 column_type_elements BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 23 NULL
46+
14 foreign_keys BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 24 NULL
47+
15 foreign_key_column_usage BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 25 NULL
48+
16 table_partitions BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 26 NULL
49+
17 table_partition_values BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 27 NULL
50+
18 index_partitions BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 28 NULL
5151
23 innodb_table_stats BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 33 NULL
5252
24 innodb_index_stats BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL 34 NULL
53-
25 character_sets BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=0;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL NULL NULL
53+
25 character_sets BASE TABLE InnoDB 83 0 avg_row_length=0;checksum=0;delay_key_write=0;key_block_size=0;pack_record=1;row_type=2;stats_auto_recalc=0;stats_persistent=0;stats_sample_pages=0; NULL NULL NULL
5454
#
5555
# Subset of definitions from columns, not including
5656
# default_values.

‎sql/dd/impl/tables/catalogs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class Catalogs: public Object_table_impl
6363
m_target_def.add_option("ENGINE=INNODB");
6464
m_target_def.add_option("DEFAULT CHARSET=utf8");
6565
m_target_def.add_option("COLLATE=utf8_bin");
66+
m_target_def.add_option("ROW_FORMAT=DYNAMIC");
6667
m_target_def.add_option("STATS_PERSISTENT=0");
6768

6869
m_target_def.add_populate_statement(

‎sql/dd/impl/tables/character_sets.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ class Character_sets : public Dictionary_object_table_impl
8282
m_target_def.add_option("ENGINE=INNODB");
8383
m_target_def.add_option("DEFAULT CHARSET=utf8");
8484
m_target_def.add_option("COLLATE=utf8_bin");
85+
m_target_def.add_option("ROW_FORMAT=DYNAMIC");
8586
m_target_def.add_option("STATS_PERSISTENT=0");
8687
}
8788

‎sql/dd/impl/tables/collations.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ class Collations : public Dictionary_object_table_impl
8181
m_target_def.add_option("ENGINE=INNODB");
8282
m_target_def.add_option("DEFAULT CHARSET=utf8");
8383
m_target_def.add_option("COLLATE=utf8_bin");
84+
m_target_def.add_option("ROW_FORMAT=DYNAMIC");
8485
m_target_def.add_option("STATS_PERSISTENT=0");
8586
}
8687

‎sql/dd/impl/tables/column_type_elements.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ class Column_type_elements : public Object_table_impl
7676
m_target_def.add_option("ENGINE=INNODB");
7777
m_target_def.add_option("DEFAULT CHARSET=utf8");
7878
m_target_def.add_option("COLLATE=utf8_bin");
79+
m_target_def.add_option("ROW_FORMAT=DYNAMIC");
7980
m_target_def.add_option("STATS_PERSISTENT=0");
8081
}
8182

‎sql/dd/impl/tables/columns.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ class Columns : public Object_table_impl
183183
m_target_def.add_option("ENGINE=INNODB");
184184
m_target_def.add_option("DEFAULT CHARSET=utf8");
185185
m_target_def.add_option("COLLATE=utf8_bin");
186+
m_target_def.add_option("ROW_FORMAT=DYNAMIC");
186187
m_target_def.add_option("STATS_PERSISTENT=0");
187188
}
188189

‎sql/dd/impl/tables/events.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ Events::Events()
146146
m_target_def.add_option("ENGINE=INNODB");
147147
m_target_def.add_option("DEFAULT CHARSET=utf8");
148148
m_target_def.add_option("COLLATE=utf8_bin");
149+
m_target_def.add_option("ROW_FORMAT=DYNAMIC");
149150
m_target_def.add_option("STATS_PERSISTENT=0");
150151
}
151152

‎sql/dd/impl/tables/foreign_key_column_usage.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ class Foreign_key_column_usage : public Object_table_impl
8383
m_target_def.add_option("ENGINE=INNODB");
8484
m_target_def.add_option("DEFAULT CHARSET=utf8");
8585
m_target_def.add_option("COLLATE=utf8_bin");
86+
m_target_def.add_option("ROW_FORMAT=DYNAMIC");
8687
m_target_def.add_option("STATS_PERSISTENT=0");
8788
}
8889

‎sql/dd/impl/tables/foreign_keys.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ class Foreign_keys : public Object_table_impl
128128
m_target_def.add_option("ENGINE=INNODB DEFAULT");
129129
m_target_def.add_option("CHARSET=utf8");
130130
m_target_def.add_option("COLLATE=utf8_bin");
131+
m_target_def.add_option("ROW_FORMAT=DYNAMIC");
131132
m_target_def.add_option("STATS_PERSISTENT=0");
132133
}
133134

0 commit comments

Comments
 (0)