Bug#21682439: BACKPORT OF BUG#20928289 TO MYSQL 5.6

jhauglid · jhauglid · commit a2ea089bf0fc · 2015-08-28T13:22:30.000+02:00
Backport from mysql-5.7 to mysql-5.6 of:

Bug#20928289: DEFAULT CMAKE EXCLUDES UTF8_5624_1 CHARSET,
              REQUIRED FOR MAIN.CTYPE_LDML

The problem was that on platforms where char is unsigned,
the server was unable to parse collation defintions which
included non-7bit ASCII characters. Affected platforms
include ARM and PowerPC.

The reason was that the parsing code in once place used
'&gt; 0' to check if a character was 7 bit or not. This
will fail if the char is unsigned.

This patch fixes the problem by rewriting the check to
check the MSB explicitly.

No test added as coverage is already included by
existing tests - e.g. main.ctype_ldml.

This patch is a modified version of the contributed patch.

(cherry picked from commit d59ac89547a75e1a422ac4e806fe7b853489764d)
diff --git a/strings/ctype.c b/strings/ctype.c
@@ -425,7 +425,7 @@ scan_one_character(const char *s, const char *e, my_wc_t *wc)
     wc[0]= 0;
     return len;
   }
-  else if (s[0] > 0) /* 7-bit character */
+  else if ((s[0] & 0x80) == 0) /* 7-bit character */
   {
     wc[0]= 0;
     return 1;

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ scan_one_character(const char s, const char e, my_wc_t *wc)`
`425`	`425`	`wc[0]= 0;`
`426`	`426`	`return len;`
`427`	`427`	`}`
`428`		`- else if (s[0] > 0) /* 7-bit character */`
	`428`	`+ else if ((s[0] & 0x80) == 0) /* 7-bit character */`
`429`	`429`	`{`
`430`	`430`	`wc[0]= 0;`
`431`	`431`	`return 1;`