Commit 18d34a47 authored by Venkata Sidagam's avatar Venkata Sidagam

Bug #16567381 DATETIME FIELD COMPARISONS DO NOT WORK PROPERLY

                WITH UTF8_UNICODE_CI COLLATION
Problem Description:
When comparing datetime values with strings, the utf8_unicode_ci collation 
prevents correct comparisons. Consider the below set of queries, it is not 
showing any results on a table which has tuples that satisfies the query. 
But for collation utf8_general_ci it shows one tuple.
set names utf8 collate utf8_unicode_ci;;
select * from lang where dt='1979-12-09';

Analysis:
The comparison function is not chosen in case of collation utf8_unicode_ci.
In agg_item_set_converter() because the collation state is having 
"MY_CS_NONASCII" for collation type "utf8_unicode_ci". The conversion 
of the collation is happening for the date field. And because of that 
it is unable to pickup proper compare function(i.e CMP_DATE_WITH_STR).

Actually the bug is accidentally introduced by the WL#3759 in 5.5. 
And in 5.6 it is been fixed by the WL#3664.

Fix:
I have backported the changes from the file strings/ctype-uca.c which 
are related to "utf8" introduced by the WL#3664.
This change helps in choosing the correct comparison function for all 
the collations of utf8 charset.
parent 3ee4a82f
...@@ -8877,10 +8877,12 @@ static uchar ctype_utf8[] = { ...@@ -8877,10 +8877,12 @@ static uchar ctype_utf8[] = {
extern MY_CHARSET_HANDLER my_charset_utf8_handler; extern MY_CHARSET_HANDLER my_charset_utf8_handler;
#define MY_CS_UTF8MB3_UCA_FLAGS (MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE)
CHARSET_INFO my_charset_utf8_unicode_ci= CHARSET_INFO my_charset_utf8_unicode_ci=
{ {
192,0,0, /* number */ 192,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_unicode_ci", /* name */ "utf8_unicode_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -8913,7 +8915,7 @@ CHARSET_INFO my_charset_utf8_unicode_ci= ...@@ -8913,7 +8915,7 @@ CHARSET_INFO my_charset_utf8_unicode_ci=
CHARSET_INFO my_charset_utf8_icelandic_uca_ci= CHARSET_INFO my_charset_utf8_icelandic_uca_ci=
{ {
193,0,0, /* number */ 193,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_icelandic_ci",/* name */ "utf8_icelandic_ci",/* name */
"", /* comment */ "", /* comment */
...@@ -8945,7 +8947,7 @@ CHARSET_INFO my_charset_utf8_icelandic_uca_ci= ...@@ -8945,7 +8947,7 @@ CHARSET_INFO my_charset_utf8_icelandic_uca_ci=
CHARSET_INFO my_charset_utf8_latvian_uca_ci= CHARSET_INFO my_charset_utf8_latvian_uca_ci=
{ {
194,0,0, /* number */ 194,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_latvian_ci", /* name */ "utf8_latvian_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -8977,7 +8979,7 @@ CHARSET_INFO my_charset_utf8_latvian_uca_ci= ...@@ -8977,7 +8979,7 @@ CHARSET_INFO my_charset_utf8_latvian_uca_ci=
CHARSET_INFO my_charset_utf8_romanian_uca_ci= CHARSET_INFO my_charset_utf8_romanian_uca_ci=
{ {
195,0,0, /* number */ 195,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_romanian_ci", /* name */ "utf8_romanian_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9009,7 +9011,7 @@ CHARSET_INFO my_charset_utf8_romanian_uca_ci= ...@@ -9009,7 +9011,7 @@ CHARSET_INFO my_charset_utf8_romanian_uca_ci=
CHARSET_INFO my_charset_utf8_slovenian_uca_ci= CHARSET_INFO my_charset_utf8_slovenian_uca_ci=
{ {
196,0,0, /* number */ 196,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_slovenian_ci",/* name */ "utf8_slovenian_ci",/* name */
"", /* comment */ "", /* comment */
...@@ -9041,7 +9043,7 @@ CHARSET_INFO my_charset_utf8_slovenian_uca_ci= ...@@ -9041,7 +9043,7 @@ CHARSET_INFO my_charset_utf8_slovenian_uca_ci=
CHARSET_INFO my_charset_utf8_polish_uca_ci= CHARSET_INFO my_charset_utf8_polish_uca_ci=
{ {
197,0,0, /* number */ 197,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_polish_ci", /* name */ "utf8_polish_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9073,7 +9075,7 @@ CHARSET_INFO my_charset_utf8_polish_uca_ci= ...@@ -9073,7 +9075,7 @@ CHARSET_INFO my_charset_utf8_polish_uca_ci=
CHARSET_INFO my_charset_utf8_estonian_uca_ci= CHARSET_INFO my_charset_utf8_estonian_uca_ci=
{ {
198,0,0, /* number */ 198,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_estonian_ci", /* name */ "utf8_estonian_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9105,7 +9107,7 @@ CHARSET_INFO my_charset_utf8_estonian_uca_ci= ...@@ -9105,7 +9107,7 @@ CHARSET_INFO my_charset_utf8_estonian_uca_ci=
CHARSET_INFO my_charset_utf8_spanish_uca_ci= CHARSET_INFO my_charset_utf8_spanish_uca_ci=
{ {
199,0,0, /* number */ 199,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_spanish_ci", /* name */ "utf8_spanish_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9137,7 +9139,7 @@ CHARSET_INFO my_charset_utf8_spanish_uca_ci= ...@@ -9137,7 +9139,7 @@ CHARSET_INFO my_charset_utf8_spanish_uca_ci=
CHARSET_INFO my_charset_utf8_swedish_uca_ci= CHARSET_INFO my_charset_utf8_swedish_uca_ci=
{ {
200,0,0, /* number */ 200,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_swedish_ci", /* name */ "utf8_swedish_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9169,7 +9171,7 @@ CHARSET_INFO my_charset_utf8_swedish_uca_ci= ...@@ -9169,7 +9171,7 @@ CHARSET_INFO my_charset_utf8_swedish_uca_ci=
CHARSET_INFO my_charset_utf8_turkish_uca_ci= CHARSET_INFO my_charset_utf8_turkish_uca_ci=
{ {
201,0,0, /* number */ 201,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_turkish_ci", /* name */ "utf8_turkish_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9201,7 +9203,7 @@ CHARSET_INFO my_charset_utf8_turkish_uca_ci= ...@@ -9201,7 +9203,7 @@ CHARSET_INFO my_charset_utf8_turkish_uca_ci=
CHARSET_INFO my_charset_utf8_czech_uca_ci= CHARSET_INFO my_charset_utf8_czech_uca_ci=
{ {
202,0,0, /* number */ 202,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_czech_ci", /* name */ "utf8_czech_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9234,7 +9236,7 @@ CHARSET_INFO my_charset_utf8_czech_uca_ci= ...@@ -9234,7 +9236,7 @@ CHARSET_INFO my_charset_utf8_czech_uca_ci=
CHARSET_INFO my_charset_utf8_danish_uca_ci= CHARSET_INFO my_charset_utf8_danish_uca_ci=
{ {
203,0,0, /* number */ 203,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_danish_ci", /* name */ "utf8_danish_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9266,7 +9268,7 @@ CHARSET_INFO my_charset_utf8_danish_uca_ci= ...@@ -9266,7 +9268,7 @@ CHARSET_INFO my_charset_utf8_danish_uca_ci=
CHARSET_INFO my_charset_utf8_lithuanian_uca_ci= CHARSET_INFO my_charset_utf8_lithuanian_uca_ci=
{ {
204,0,0, /* number */ 204,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_lithuanian_ci",/* name */ "utf8_lithuanian_ci",/* name */
"", /* comment */ "", /* comment */
...@@ -9298,7 +9300,7 @@ CHARSET_INFO my_charset_utf8_lithuanian_uca_ci= ...@@ -9298,7 +9300,7 @@ CHARSET_INFO my_charset_utf8_lithuanian_uca_ci=
CHARSET_INFO my_charset_utf8_slovak_uca_ci= CHARSET_INFO my_charset_utf8_slovak_uca_ci=
{ {
205,0,0, /* number */ 205,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_slovak_ci", /* name */ "utf8_slovak_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9330,7 +9332,7 @@ CHARSET_INFO my_charset_utf8_slovak_uca_ci= ...@@ -9330,7 +9332,7 @@ CHARSET_INFO my_charset_utf8_slovak_uca_ci=
CHARSET_INFO my_charset_utf8_spanish2_uca_ci= CHARSET_INFO my_charset_utf8_spanish2_uca_ci=
{ {
206,0,0, /* number */ 206,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_spanish2_ci", /* name */ "utf8_spanish2_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9362,7 +9364,7 @@ CHARSET_INFO my_charset_utf8_spanish2_uca_ci= ...@@ -9362,7 +9364,7 @@ CHARSET_INFO my_charset_utf8_spanish2_uca_ci=
CHARSET_INFO my_charset_utf8_roman_uca_ci= CHARSET_INFO my_charset_utf8_roman_uca_ci=
{ {
207,0,0, /* number */ 207,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_roman_ci", /* name */ "utf8_roman_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9394,7 +9396,7 @@ CHARSET_INFO my_charset_utf8_roman_uca_ci= ...@@ -9394,7 +9396,7 @@ CHARSET_INFO my_charset_utf8_roman_uca_ci=
CHARSET_INFO my_charset_utf8_persian_uca_ci= CHARSET_INFO my_charset_utf8_persian_uca_ci=
{ {
208,0,0, /* number */ 208,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_persian_ci", /* name */ "utf8_persian_ci", /* name */
"", /* comment */ "", /* comment */
...@@ -9426,7 +9428,7 @@ CHARSET_INFO my_charset_utf8_persian_uca_ci= ...@@ -9426,7 +9428,7 @@ CHARSET_INFO my_charset_utf8_persian_uca_ci=
CHARSET_INFO my_charset_utf8_esperanto_uca_ci= CHARSET_INFO my_charset_utf8_esperanto_uca_ci=
{ {
209,0,0, /* number */ 209,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_esperanto_ci",/* name */ "utf8_esperanto_ci",/* name */
"", /* comment */ "", /* comment */
...@@ -9458,7 +9460,7 @@ CHARSET_INFO my_charset_utf8_esperanto_uca_ci= ...@@ -9458,7 +9460,7 @@ CHARSET_INFO my_charset_utf8_esperanto_uca_ci=
CHARSET_INFO my_charset_utf8_hungarian_uca_ci= CHARSET_INFO my_charset_utf8_hungarian_uca_ci=
{ {
210,0,0, /* number */ 210,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_hungarian_ci",/* name */ "utf8_hungarian_ci",/* name */
"", /* comment */ "", /* comment */
...@@ -9490,7 +9492,7 @@ CHARSET_INFO my_charset_utf8_hungarian_uca_ci= ...@@ -9490,7 +9492,7 @@ CHARSET_INFO my_charset_utf8_hungarian_uca_ci=
CHARSET_INFO my_charset_utf8_sinhala_uca_ci= CHARSET_INFO my_charset_utf8_sinhala_uca_ci=
{ {
211,0,0, /* number */ 211,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
"utf8", /* cs name */ "utf8", /* cs name */
"utf8_sinhala_ci", /* name */ "utf8_sinhala_ci", /* name */
"", /* comment */ "", /* comment */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment