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

expression: fix builtin IF truncation of type len #20743

Merged
merged 9 commits into from Nov 19, 2020
Merged

expression: fix builtin IF truncation of type len #20743

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d7cd713
expression: fix builtin IF truncation of type len
Oct 30, 2020
065b634
Merge remote-tracking branch 'upstream/master' into fix-builtin-if
Nov 4, 2020
40e862b
Change 21 to const (MaxRealWidth = 23)
Nov 10, 2020
8cda212
Merge remote-tracking branch 'upstream/master' into fix-builtin-if
Nov 13, 2020
84b19f2
Address reviewer feedback
Nov 19, 2020
3cb66b7
Merge branch 'master' into fix-builtin-if
Nov 19, 2020
90b19bc
Merge branch 'master' into fix-builtin-if
ti-srebot Nov 19, 2020
7a5b60d
Merge branch 'master' into fix-builtin-if
ti-srebot Nov 19, 2020
1f6083b
Merge branch 'master' into fix-builtin-if
ti-srebot Nov 19, 2020
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into fix-builtin-if
  • Loading branch information
Null not nil committed Nov 4, 2020
commit 065b6346af6ac402cd98da4adb9c9029f1680c2e
7 changes: 7 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7659,3 +7659,10 @@ func (s *testIntegrationSuite) TestIssue20730(c *C) {
tk.MustExec("SET @sum := 10")
tk.MustQuery("SELECT @sum := IF(@sum=20,4,@sum + tmp.value) sum FROM tmp ORDER BY tmp.id").Check(testkit.Rows("11", "13", "16", "20", "4"))
}

func (s *testIntegrationSerialSuite) TestIssue20608(c *C) {
collate.SetNewCollationEnabledForTest(true)
defer collate.SetNewCollationEnabledForTest(false)
tk := testkit.NewTestKit(c, s.store)
tk.MustQuery("select '䇇Հ' collate utf8mb4_bin like '___Հ';").Check(testkit.Rows("0"))
}
You are viewing a condensed version of this merge commit. You can view the full changes here.