variable: Add innodb_default_row_format as noop

pingcap · Mar 26, 2021 · 2b5dd0d · 2b5dd0d
1 parent 40b9218
commit 2b5dd0d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -8926,3 +8926,11 @@ func (s *testIntegrationSuite) TestClusteredIndexCorCol(c *C) {
  tk.MustExec("insert into t2 select * from t1 ;")
  tk.MustQuery("select (select t2.c_str from t2 where t2.c_str = t1.c_str and t2.c_int = 10 order by t2.c_str limit 1) x from t1;").Check(testkit.Rows("<nil>", "goofy mestorf"))
 }
+
+func (s *testIntegrationSuite) TestJiraSetInnoDBDefaultRowFormat(c *C) {
+ // For issue #23541
+ // JIRA needs to be able to set this to be happy.
+ tk := testkit.NewTestKit(c, s.store)
+ tk.MustExec("set global innodb_default_row_format = dynamic")
+ tk.MustExec("set global innodb_default_row_format = 'dynamic'")
+}
diff --git a/sessionctx/variable/noop.go b/sessionctx/variable/noop.go
@@ -75,7 +75,8 @@ var noopSysVars = []*SysVar{
  {Scope: ScopeGlobal | ScopeSession, Name: "range_alloc_block_size", Value: "4096", IsHintUpdatable: true},
  {Scope: ScopeNone, Name: "have_rtree_keys", Value: "YES"},
  {Scope: ScopeGlobal, Name: "innodb_old_blocks_pct", Value: "37"},
- {Scope: ScopeGlobal, Name: "innodb_file_format", Value: "Antelope"},
+ {Scope: ScopeGlobal, Name: "innodb_file_format", Value: "Barracuda", Type: TypeEnum, PossibleValues: []string{"Antelope", "Barracuda"}},
+ {Scope: ScopeGlobal, Name: "innodb_default_row_format", Value: "dynamic", Type: TypeEnum, PossibleValues: []string{"redundant", "compact", "dynamic"}},
  {Scope: ScopeGlobal, Name: "innodb_compression_failure_threshold_pct", Value: "5"},
  {Scope: ScopeNone, Name: "performance_schema_events_waits_history_long_size", Value: "10000"},
  {Scope: ScopeGlobal, Name: "innodb_checksum_algorithm", Value: "innodb"},