diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2009-03-19 15:22:08 +0300 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2009-03-19 15:22:08 +0300 |
| commit | 64ed42d09ebf8216fe1b2dc54f9205f48ee666f1 (patch) | |
| tree | 7dc55749577391a54b5cc743ba4becf49a74b3cf /mysql-test/t | |
| parent | 5b8156e07fe832f71b17c07d09a90966797a7589 (diff) | |
| parent | fe1b3b941c3f70e9d15377b449aa6c12698ce5ea (diff) | |
| download | mariadb-git-64ed42d09ebf8216fe1b2dc54f9205f48ee666f1.tar.gz | |
Merge @@optimizer_switch no_xxx -> xxx=off change to 6.0
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/ctype_collate.test | 14 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 33 |
2 files changed, 47 insertions, 0 deletions
diff --git a/mysql-test/t/ctype_collate.test b/mysql-test/t/ctype_collate.test index cfef8dfe81a..6b6abbcfbcc 100644 --- a/mysql-test/t/ctype_collate.test +++ b/mysql-test/t/ctype_collate.test @@ -229,3 +229,17 @@ insert into t1 set a=0x6c; insert into t1 set a=0x4c98; check table t1 extended; drop table t1; + +# +# Bug#41627 Illegal mix of collations in LEAST / GREATEST / CASE +# +select least(_latin1'a',_latin2'b',_latin5'c' collate latin5_turkish_ci); +create table t1 +select least(_latin1'a',_latin2'b',_latin5'c' collate latin5_turkish_ci) as f1; +show create table t1; +drop table t1; + +select case _latin1'a' when _latin2'b' then 1 when _latin5'c' collate +latin5_turkish_ci then 2 else 3 end; + +select concat(_latin1'a',_latin2'b',_latin5'c' collate latin5_turkish_ci); diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 7e970d5b104..294ed8201bc 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -342,6 +342,39 @@ EOF remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql; +# +# Bug #41486: extra character appears in BLOB for every ~40Mb after +# mysqldump/import +# + +# Have to change the global variable as the session variable is +# read-only. +set @old_max_allowed_packet = @@global.max_allowed_packet; +# 2 MB blob length + some space for the rest of INSERT query +set @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024; + +# Create a new connection since the global max_allowed_packet +# has no effect for the current connection +connect (con1, localhost, root,,); +connection con1; + +CREATE TABLE t1(data LONGBLOB); +INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024); + +--exec $MYSQL_DUMP test t1 >$MYSQLTEST_VARDIR/tmp/bug41486.sql +# Check that the mysql client does not insert extra newlines when loading +# strings longer than client's max_allowed_packet +--exec $MYSQL --max_allowed_packet=1M test < $MYSQLTEST_VARDIR/tmp/bug41486.sql 2>&1 +SELECT LENGTH(data) FROM t1; + +remove_file $MYSQLTEST_VARDIR/tmp/bug41486.sql; +DROP TABLE t1; + +connection default; +disconnect con1; + +set @@global.max_allowed_packet = @old_max_allowed_packet; + --echo End of 5.0 tests # |