bk commit into 4.1 tree (bar:1.2443) BUG#13145

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2443 05/09/16 14:22:11 bar@stripped +3 -0
    Bug#13145: A table named "C-cedilla" can't be dropped.
  ctype_latin1.test, ctype_latin1.result:
    adding test case
  ctype-latin1.c:
    Fixing ctype array to treat extended cp1252
    letters as valid identifiers on server side,
    and as valid "isprint" characters (e.g. on client side).

  mysql-test/r/ctype_latin1.result
    1.6 05/09/16 14:20:15 bar@stripped +3 -0
    adding test case

  mysql-test/t/ctype_latin1.test
    1.6 05/09/16 14:20:08 bar@stripped +17 -0
    Accept extended cp1252 letters as valid identifiers.

  strings/ctype-latin1.c
    1.43 05/09/16 14:19:45 bar@stripped +2 -2
    Bug#13145: A table named "C-cedilla" can't be dropped.
    Accept extended cp1252 letters as valid identifiers.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.5/mysql-test/r/ctype_latin1.result	2005-07-21 16:03:15 +05:00
+++ 1.6/mysql-test/r/ctype_latin1.result	2005-09-16 14:20:15 +05:00
@@ -296,6 +296,9 @@
 FE	C3BE	FE	1
 FF	C3BF	FF	1
 DROP TABLE t1;
+SELECT 1 as ƒ, 2 as Š, 3 as Œ, 4 as Ž, 5 as š, 6 as œ, 7 as ž, 8 as Ÿ;
+ƒ	Š	Œ	Ž	š	œ	ž	Ÿ
[phone]
 select 'a' regexp 'A' collate latin1_general_ci;
 'a' regexp 'A' collate latin1_general_ci
 1

--- 1.5/mysql-test/t/ctype_latin1.test	2005-07-28 05:21:40 +05:00
+++ 1.6/mysql-test/t/ctype_latin1.test	2005-09-16 14:20:08 +05:00
@@ -55,6 +55,23 @@
 DROP TABLE t1;
 
 #
+# Bug#13145: A table named "C-cedilla" can't be dropped.
+# Accept extended cp1252 letters as valid identifiers.
+# This test partially checks that "ctype" array is correct
+# for cp1252 extended characters 0x80-0x9F.
+#
+# 0x83 0x0192  #LATIN SMALL LETTER F WITH HOOK
+# 0x8A 0x0160  #LATIN CAPITAL LETTER S WITH CARON
+# 0x8C 0x0152  #LATIN CAPITAL LIGATURE OE
+# 0x8E 0x017D  #LATIN CAPITAL LETTER Z WITH CARON
+# 0x9A 0x0161  #LATIN SMALL LETTER S WITH CARON
+# 0x9C 0x0153  #LATIN SMALL LIGATURE OE
+# 0x9E 0x017E  #LATIN SMALL LETTER Z WITH CARON
+# 0x9F 0x0178  #LATIN CAPITAL LETTER Y WITH DIAERESIS
+#
+SELECT 1 as ƒ, 2 as Š, 3 as Œ, 4 as Ž, 5 as š, 6 as œ, 7 as ž, 8 as Ÿ;
+
+#
 # Bug #6737: REGEXP gives wrong result with case sensitive collation
 #
 select 'a' regexp 'A' collate latin1_general_ci;

--- 1.42/strings/ctype-latin1.c	2005-08-17 13:26:28 +05:00
+++ 1.43/strings/ctype-latin1.c	2005-09-16 14:19:45 +05:00
@@ -28,8 +28,8 @@
     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 16, 16, 16, 16,
    16,130,130,130,130,130,130,  2,  2,  2,  2,  2,  2,  2,  2,  2,
     2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 16, 16, 16, 16, 32,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   16,  0, 16,  2, 16, 16, 16, 16, 16, 16,  1, 16,  1,  0,  1,  0,
+    0, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16,  2,  0,  2,  1,
    72, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,