Commit 49b3a420 authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt 

into  mysql.com:/usr/home/bar/mysql-5.1-kt
parents 161a27d5 92a14462

mysql-test/r/ctype_latin1.result

+14 −0
Original line number Diff line number Diff line
@@ -391,3 +391,17 @@ ABC 
SELECT convert(@str collate latin1_swedish_ci using utf8);

convert(@str collate latin1_swedish_ci using utf8)

ABC ߲~    @ abc

SET NAMES latin1;

DROP TABLE IF EXISTS `abcdef`;

CREATE TABLE `abcdef` (i int);

INSERT INTO `abcdef` VALUES (1);

INSERT INTO abcdef VALUES (2);

SELECT * FROM `abcdef`;

i

1

2

SELECT * FROM abcdef;

i

1

2

DROP TABLE `abcdef`;

mysql-test/t/ctype_latin1.test

+11 −0
Original line number Diff line number Diff line
@@ -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 `abcdef`;

--enable_warnings

CREATE TABLE `abcdef` (i int);

INSERT INTO `abcdef` VALUES (1);

INSERT INTO abcdef VALUES (2);

SELECT * FROM `abcdef`;

SELECT * FROM abcdef;

DROP TABLE `abcdef`;

sql/sql_lex.cc

+0 −2
Original line number Diff line number Diff line
@@ -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)