diff options
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/ctype_gbk.result | 21 | ||||
-rw-r--r-- | mysql-test/r/ctype_utf8.result | 27 | ||||
-rw-r--r-- | mysql-test/std_data/loaddata/mdev8711.txt | 1 | ||||
-rw-r--r-- | mysql-test/std_data/loaddata/mdev9824.txt | 1 | ||||
-rw-r--r-- | mysql-test/t/ctype_gbk.test | 19 | ||||
-rw-r--r-- | mysql-test/t/ctype_utf8.test | 19 |
6 files changed, 88 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_gbk.result b/mysql-test/r/ctype_gbk.result index b5774548d85..e454347592c 100644 --- a/mysql-test/r/ctype_gbk.result +++ b/mysql-test/r/ctype_gbk.result @@ -5926,3 +5926,24 @@ Warning 1300 Invalid gb2312 character string: '\xA3A' # # End of 10.1 tests # +# +# Start of 10.2 tests +# +# +# MDEV-9811 LOAD DATA INFILE does not work well with gbk in some cases +# +CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET gbk); +LOAD DATA INFILE '../../std_data/loaddata/mdev8711.txt' INTO TABLE t1 CHARACTER SET gbk LINES TERMINATED BY '@'; +SELECT HEX(a) FROM t1; +HEX(a) +B04061B041 +B042 +DELETE FROM t1; +LOAD DATA INFILE '../../std_data/loaddata/mdev8711.txt' INTO TABLE t1 CHARACTER SET gbk LINES TERMINATED BY '@' IGNORE 1 LINES; +SELECT HEX(a) FROM t1; +HEX(a) +B042 +DROP TABLE t1; +# +# End of 10.2 tests +# diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result index 816fe654028..f52e08a676f 100644 --- a/mysql-test/r/ctype_utf8.result +++ b/mysql-test/r/ctype_utf8.result @@ -10401,3 +10401,30 @@ SET @@SQL_MODE=default; # # End of 10.1 tests # +# +# Start of 10.2 tests +# +# +# MDEV-9824 LOAD DATA does not work with multi-byte strings in LINES TERMINATED BY when IGNORE is specified +# +CREATE TABLE t1 (c1 VARCHAR(10) CHARACTER SET utf8); +LOAD DATA INFILE '../../std_data/loaddata/mdev9824.txt' INTO TABLE t1 CHARACTER SET utf8 LINES TERMINATED BY 'Ñ‘Ñ‘'; +Warnings: +Warning 1638 Non-ASCII separator arguments are not fully supported +SELECT c1 FROM t1; +c1 +a +b +c +DELETE FROM t1; +LOAD DATA INFILE '../../std_data/loaddata/mdev9824.txt' INTO TABLE t1 CHARACTER SET utf8 LINES TERMINATED BY 'Ñ‘Ñ‘' IGNORE 1 LINES; +Warnings: +Warning 1638 Non-ASCII separator arguments are not fully supported +SELECT c1 FROM t1; +c1 +b +c +DROP TABLE t1; +# +# End of 10.2 tests +# diff --git a/mysql-test/std_data/loaddata/mdev8711.txt b/mysql-test/std_data/loaddata/mdev8711.txt new file mode 100644 index 00000000000..49296a7134d --- /dev/null +++ b/mysql-test/std_data/loaddata/mdev8711.txt @@ -0,0 +1 @@ +°@a°A@°B@
\ No newline at end of file diff --git a/mysql-test/std_data/loaddata/mdev9824.txt b/mysql-test/std_data/loaddata/mdev9824.txt new file mode 100644 index 00000000000..7050e081844 --- /dev/null +++ b/mysql-test/std_data/loaddata/mdev9824.txt @@ -0,0 +1 @@ +aёёbёёcёё
\ No newline at end of file diff --git a/mysql-test/t/ctype_gbk.test b/mysql-test/t/ctype_gbk.test index 07e73cdf745..ae66dbba4b5 100644 --- a/mysql-test/t/ctype_gbk.test +++ b/mysql-test/t/ctype_gbk.test @@ -435,3 +435,22 @@ SELECT HEX(CONVERT(CAST(0xA341 AS CHAR CHARACTER SET gb2312) USING utf8)); --echo # --echo # End of 10.1 tests --echo # + +--echo # +--echo # Start of 10.2 tests +--echo # + +--echo # +--echo # MDEV-9811 LOAD DATA INFILE does not work well with gbk in some cases +--echo # +CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET gbk); +LOAD DATA INFILE '../../std_data/loaddata/mdev8711.txt' INTO TABLE t1 CHARACTER SET gbk LINES TERMINATED BY '@'; +SELECT HEX(a) FROM t1; +DELETE FROM t1; +LOAD DATA INFILE '../../std_data/loaddata/mdev8711.txt' INTO TABLE t1 CHARACTER SET gbk LINES TERMINATED BY '@' IGNORE 1 LINES; +SELECT HEX(a) FROM t1; +DROP TABLE t1; + +--echo # +--echo # End of 10.2 tests +--echo # diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test index 85ffed943cf..f3a9e63b57d 100644 --- a/mysql-test/t/ctype_utf8.test +++ b/mysql-test/t/ctype_utf8.test @@ -1950,3 +1950,22 @@ SET @@SQL_MODE=default; --echo # --echo # End of 10.1 tests --echo # + +--echo # +--echo # Start of 10.2 tests +--echo # + +--echo # +--echo # MDEV-9824 LOAD DATA does not work with multi-byte strings in LINES TERMINATED BY when IGNORE is specified +--echo # +CREATE TABLE t1 (c1 VARCHAR(10) CHARACTER SET utf8); +LOAD DATA INFILE '../../std_data/loaddata/mdev9824.txt' INTO TABLE t1 CHARACTER SET utf8 LINES TERMINATED BY 'Ñ‘Ñ‘'; +SELECT c1 FROM t1; +DELETE FROM t1; +LOAD DATA INFILE '../../std_data/loaddata/mdev9824.txt' INTO TABLE t1 CHARACTER SET utf8 LINES TERMINATED BY 'Ñ‘Ñ‘' IGNORE 1 LINES; +SELECT c1 FROM t1; +DROP TABLE t1; + +--echo # +--echo # End of 10.2 tests +--echo # |