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 wrong flen infer for bit constant (#23867) #24266

Merged
merged 15 commits into from
May 11, 2021
Merged

expression: fix wrong flen infer for bit constant (#23867) #24266

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
aca610b
cherry pick #23867 to release-4.0
lzmhhh123 Apr 25, 2021
5a5eddc
fix conflicts
lzmhhh123 Apr 25, 2021
b1d1e87
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot Apr 28, 2021
b55263d
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot Apr 30, 2021
9281728
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot May 7, 2021
f315e32
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot May 7, 2021
97acfce
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot May 7, 2021
4797e78
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot May 8, 2021
b4eccc2
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot May 10, 2021
c076580
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot May 10, 2021
d336d54
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
lzmhhh123 May 11, 2021
557e35b
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot May 11, 2021
9cf2950
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot May 11, 2021
a4f5ded
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot May 11, 2021
682421f
Merge branch 'release-4.0' into release-4.0-2c67a8011c7c
ti-chi-bot May 11, 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
5 changes: 5 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4555,6 +4555,11 @@ func (s *testIntegrationSuite) TestIssues(c *C) {
tk.MustExec(`insert into t2 values(1,"1111"),(2,"2222"),(3,"3333"),(4,"4444"),(5,"5555"),(6,"6666"),(7,"7777"),(8,"8888"),(9,"9999"),(10,"0000")`)
tk.MustQuery(`select (@j := case when substr(t2.b,1,3)=@i then 1 else @j+1 end) from t2, (select @j := 0, @i := "0") tt limit 10`).Check(testkit.Rows(
"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"))

// for issue #23479
tk.MustQuery("select b'10000000' DIV 10").Check(testkit.Rows("12"))
tk.MustQuery("select cast(b'10000000' as unsigned) / 10").Check(testkit.Rows("12.8000"))
tk.MustQuery("select b'10000000' / 10").Check(testkit.Rows("12.8000"))
}

func (s *testIntegrationSuite) TestInPredicate4UnsignedInt(c *C) {
Expand Down
6 changes: 3 additions & 3 deletions expression/typeinfer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ func (s *testInferTypeSuite) createTestCase4Constants() []typeInferTestCase {
{"'1234'", mysql.TypeVarString, charset.CharsetUTF8MB4, 0, 4, types.UnspecifiedLength},
{"_utf8'1234'", mysql.TypeVarString, charset.CharsetUTF8, 0, 4, types.UnspecifiedLength},
{"_binary'1234'", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag, 4, types.UnspecifiedLength},
{"b'0001'", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag, 1, 0},
{"b'000100001'", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag, 2, 0},
{"b'0000000000010000'", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag, 2, 0},
{"b'0001'", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag, 3, 0},
{"b'000100001'", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag, 6, 0},
{"b'0000000000010000'", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag, 6, 0},
{"x'10'", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag | mysql.UnsignedFlag, 3, 0},
{"x'ff10'", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag | mysql.UnsignedFlag, 6, 0},
{"x'0000000000000000ff10'", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag | mysql.UnsignedFlag, 30, 0},
Expand Down
2 changes: 1 addition & 1 deletion types/field_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ func DefaultTypeForValue(value interface{}, tp *FieldType, char string, collate
SetBinChsClnFlag(tp)
case BitLiteral:
tp.Tp = mysql.TypeVarString
tp.Flen = len(x)
tp.Flen = len(x) * 3
tp.Decimal = 0
SetBinChsClnFlag(tp)
case HexLiteral:
Expand Down