mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18396

Browse source 
into  mysql.com:/usr/home/bar/mysql-5.1-kt


sql/sql_lex.cc:
  Auto merged
This commit is contained in:
unknown 2006-06-19 19:15:03 +05:00
commit 92a14462b5
3 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mysql-test/r/ctype_latin1.result
View file

@ -391,3 +391,17 @@ ABC
SELECT convert(@str collate latin1_swedish_ci using utf8); SELECT convert(@str collate latin1_swedish_ci using utf8);
convert(@str collate latin1_swedish_ci using utf8) convert(@str collate latin1_swedish_ci using utf8)
ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc
SET NAMES latin1;
DROP TABLE IF EXISTS `abc˙def`;
CREATE TABLE `abc˙def` (i int);
INSERT INTO `abc˙def` VALUES (1);
INSERT INTO abc˙def VALUES (2);
SELECT * FROM `abc˙def`;
i
1
2
SELECT * FROM abc˙def;
i
1
2
DROP TABLE `abc˙def`;

11
mysql-test/t/ctype_latin1.test
View file

@ -110,3 +110,14 @@ SELECT convert(@str collate latin1_german2_ci using utf8);
SELECT convert(@str collate latin1_swedish_ci using utf8); SELECT convert(@str collate latin1_swedish_ci using utf8);
# End of 4.1 tests # End of 4.1 tests
SET NAMES latin1;
--disable_warnings
DROP TABLE IF EXISTS `abc˙def`;
--enable_warnings
CREATE TABLE `abc˙def` (i int);
INSERT INTO `abc˙def` VALUES (1);
INSERT INTO abc˙def VALUES (2);
SELECT * FROM `abc˙def`;
SELECT * FROM abc˙def;
DROP TABLE `abc˙def`;

2
sql/sql_lex.cc
View file

@ -777,8 +777,6 @@ int MYSQLlex(void *arg, void *yythd)
int length; int length;
if ((length= my_mbcharlen(cs, c)) == 1) if ((length= my_mbcharlen(cs, c)) == 1)
{ {
if (c == (uchar) NAMES_SEP_CHAR)
break; /* Old .frm format can't handle this char */
if (c == quote_char) if (c == quote_char)
{ {
if (yyPeek() != quote_char) if (yyPeek() != quote_char)