sessionctx: change innodb large prefix default (#24555) (#26061)

pingcap · Jul 14, 2021 · e91a8a5 · e91a8a5
1 parent 7874d60
commit e91a8a5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -8238,3 +8238,16 @@ func (s *testIntegrationSuite2) TestIssue25591(c *C) {
  rows = tk.MustQuery("select t1.col1, t2.col1, t2.col2 from t1_1 t1 inner join t2_1 t2 on t1.col1 not in (1,t2.col1,t2.col2) order by 1,2,3;")
  rows.Check(testkit.Rows())
 }
+
+func (s *testIntegrationSuite) TestJiraSetInnoDBDefaultRowFormat(c *C) {
+ // For issue #23541
+ // JIRA needs to be able to set this to be happy.
+ // See: https://nova.moe/run-jira-on-tidb/
+ tk := testkit.NewTestKit(c, s.store)
+ tk.MustExec("set global innodb_default_row_format = dynamic")
+ tk.MustExec("set global innodb_default_row_format = 'dynamic'")
+ tk.MustQuery("SHOW VARIABLES LIKE 'innodb_default_row_format'").Check(testkit.Rows("innodb_default_row_format dynamic"))
+ tk.MustQuery("SHOW VARIABLES LIKE 'character_set_server'").Check(testkit.Rows("character_set_server utf8mb4"))
+ tk.MustQuery("SHOW VARIABLES LIKE 'innodb_file_format'").Check(testkit.Rows("innodb_file_format Barracuda"))
+ tk.MustQuery("SHOW VARIABLES LIKE 'innodb_large_prefix'").Check(testkit.Rows("innodb_large_prefix ON"))
+}
diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go
@@ -160,7 +160,8 @@ var defaultSysVars = []*SysVar{
  {ScopeGlobal | ScopeSession, CollationServer, mysql.DefaultCollationName},
  {ScopeNone, "have_rtree_keys", "YES"},
  {ScopeGlobal, "innodb_old_blocks_pct", "37"},
- {ScopeGlobal, "innodb_file_format", "Antelope"},
+ {ScopeGlobal, "innodb_file_format", "Barracuda"},
+ {ScopeGlobal, "innodb_default_row_format", "dynamic"},
  {ScopeGlobal, "innodb_compression_failure_threshold_pct", "5"},
  {ScopeNone, "performance_schema_events_waits_history_long_size", "10000"},
  {ScopeGlobal, "innodb_checksum_algorithm", "innodb"},
@@ -430,7 +431,7 @@ var defaultSysVars = []*SysVar{
  {ScopeNone, "version", mysql.ServerVersion},
  {ScopeGlobal | ScopeSession, "transaction_alloc_block_size", "8192"},
  {ScopeGlobal, "sql_slave_skip_counter", "0"},
- {ScopeGlobal, "innodb_large_prefix", "OFF"},
+ {ScopeGlobal, "innodb_large_prefix", "ON"},
  {ScopeNone, "performance_schema_max_cond_classes", "80"},
  {ScopeGlobal, "innodb_io_capacity", "200"},
  {ScopeGlobal, "max_binlog_cache_size", "18446744073709547520"},