database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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
parent fa3c7e99e5 6a6bedfa05
commit 92a14462b5
3 changed files with 25 additions and 2 deletions
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);
convert(@str collate latin1_swedish_ci using utf8)
ABC <20><><EFBFBD>߲<EFBFBD><DFB2>~ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> @ abc
SET NAMES latin1;
DROP TABLE IF EXISTS `abc<62>def`;
CREATE TABLE `abc<62>def` (i int);
INSERT INTO `abc<62>def` VALUES (1);
INSERT INTO abc<62>def VALUES (2);
SELECT * FROM `abc<62>def`;
i
1
2
SELECT * FROM abc<62>def;
i
1
2
DROP TABLE `abc<62>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);
# End of 4.1 tests
SET NAMES latin1;
--disable_warnings
DROP TABLE IF EXISTS `abc<62>def`;
--enable_warnings
CREATE TABLE `abc<62>def` (i int);
INSERT INTO `abc<62>def` VALUES (1);
INSERT INTO abc<62>def VALUES (2);
SELECT * FROM `abc<62>def`;
SELECT * FROM abc<62>def;
DROP TABLE `abc<62>def`;

2
sql/sql_lex.cc
View File

@ -777,8 +777,6 @@ int MYSQLlex(void *arg, void *yythd)
int length;
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 (yyPeek() != quote_char)