post-push fix: Preserving warning codes from mysql-next-mr. Updated

result files.

Warnings affected:
 - WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
 - ER_TOO_LONG_FIELD_COMMENT

2 files changed, 11 insertions, 11 deletions

diff --git a/mysql-test/r/outfile_loaddata.result b/mysql-test/r/outfile_loaddata.result
index 66ff28298ba..453e3adb54c 100644
--- a/mysql-test/r/outfile_loaddata.result
+++ b/mysql-test/r/outfile_loaddata.result
@@ -92,14 +92,14 @@ HEX(c1)
 C3
 SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug32533.txt' FIELDS ENCLOSED BY 0xC3 FROM t1;
 Warnings:
-Warning	1639	Non-ASCII separator arguments are not fully supported
+Warning	1638	Non-ASCII separator arguments are not fully supported
 TRUNCATE t1;
 SELECT HEX(LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug32533.txt'));
 HEX(LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug32533.txt'))
 C35CC3C30A
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug32533.txt' INTO TABLE t1 FIELDS ENCLOSED BY 0xC3;
 Warnings:
-Warning	1639	Non-ASCII separator arguments are not fully supported
+Warning	1638	Non-ASCII separator arguments are not fully supported
 SELECT HEX(c1) FROM t1;
 HEX(c1)
 C3
@@ -124,17 +124,17 @@ ERROR 42000: Field separator argument is not what is expected; check the manual
 # LOAD DATA rises error or has unpredictable result -- to be fixed later
 SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS ENCLOSED BY 'ъ';
 Warnings:
-Warning	1639	Non-ASCII separator arguments are not fully supported
+Warning	1638	Non-ASCII separator arguments are not fully supported
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS ENCLOSED BY 'ъ';
 ERROR 42000: Field separator argument is not what is expected; check the manual
 SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS ESCAPED BY 'ъ';
 Warnings:
-Warning	1639	Non-ASCII separator arguments are not fully supported
+Warning	1638	Non-ASCII separator arguments are not fully supported
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS ESCAPED BY 'ъ';
 ERROR 42000: Field separator argument is not what is expected; check the manual
 SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS TERMINATED BY 'ъ';
 Warnings:
-Warning	1639	Non-ASCII separator arguments are not fully supported
+Warning	1638	Non-ASCII separator arguments are not fully supported
 ##################################################
 1ъABC-���ъDEF-���
 2ъ\Nъ\N
@@ -142,7 +142,7 @@ Warning	1639	Non-ASCII separator arguments are not fully supported
 TRUNCATE t2;
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS TERMINATED BY 'ъ';
 Warnings:
-Warning	1639	Non-ASCII separator arguments are not fully supported
+Warning	1638	Non-ASCII separator arguments are not fully supported
 Warning	1265	Data truncated for column 'a' at row 1
 Warning	1261	Row 1 doesn't contain data for all columns
 Warning	1261	Row 1 doesn't contain data for all columns
@@ -156,7 +156,7 @@ a	b	c
 2	NULL	NULL
 SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES STARTING BY 'ъ';
 Warnings:
-Warning	1639	Non-ASCII separator arguments are not fully supported
+Warning	1638	Non-ASCII separator arguments are not fully supported
 ##################################################
 ъ1	ABC-���	DEF-���
 ъ2	\N	\N
@@ -164,20 +164,20 @@ Warning	1639	Non-ASCII separator arguments are not fully supported
 TRUNCATE t2;
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary LINES STARTING BY 'ъ';
 Warnings:
-Warning	1639	Non-ASCII separator arguments are not fully supported
+Warning	1638	Non-ASCII separator arguments are not fully supported
 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
 a	b	c
 1	ABC-АБВ	DEF-ÂÃÄ
 2	NULL	NULL
 SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES TERMINATED BY 'ъ';
 Warnings:
-Warning	1639	Non-ASCII separator arguments are not fully supported
+Warning	1638	Non-ASCII separator arguments are not fully supported
 ##################################################
 1	ABC-���	DEF-���ъ2	\N	\Nъ##################################################
 TRUNCATE t2;
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary LINES TERMINATED BY 'ъ';
 Warnings:
-Warning	1639	Non-ASCII separator arguments are not fully supported
+Warning	1638	Non-ASCII separator arguments are not fully supported
 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
 a	b	c
 1	ABC-АБВ	DEF-ÂÃÄ
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result
index b427340d250..a9e0d7f457d 100644
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -1327,7 +1327,7 @@ create table t1
   123456789*123456789*123456789*123456789*
   123456789*123456789*123456789*123456789*');
 Warnings:
-Warning	1630	Comment for field 'i' is too long (max = 255)
+Warning	1629	Comment for field 'i' is too long (max = 255)
 select column_name, column_comment from information_schema.columns where
 table_schema = 'test' and table_name = 't1';
 column_name	column_comment