Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

variable: Add innodb_default_row_format as noop #23568

Merged
merged 6 commits into from
Mar 30, 2021
Merged

variable: Add innodb_default_row_format as noop #23568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b5dd0d
variable: Add innodb_default_row_format as noop
morgo Mar 26, 2021
fb00bfc
Merge remote-tracking branch 'upstream/master' into add-innodb-defaul…
morgo Mar 26, 2021
ea25880
Merge branch 'master' into add-innodb-default-row-format
ti-chi-bot Mar 30, 2021
2bf1172
Merge branch 'master' into add-innodb-default-row-format
ti-chi-bot Mar 30, 2021
c51496a
Merge branch 'master' into add-innodb-default-row-format
ti-chi-bot Mar 30, 2021
88a0baa
Merge branch 'master' into add-innodb-default-row-format
ti-chi-bot Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8927,6 +8927,14 @@ func (s *testIntegrationSuite) TestClusteredIndexCorCol(c *C) {
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) {
zz-jason marked this conversation as resolved.
Show resolved Hide resolved
// 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'")
}

func (s *testIntegrationSerialSuite) TestCollationForBinaryLiteral(c *C) {
tk := testkit.NewTestKit(c, s.store)
collate.SetNewCollationEnabledForTest(true)
Expand Down
3 changes: 2 additions & 1 deletion sessionctx/variable/noop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down