diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/cast.test | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/cast.test')
| -rw-r--r-- | mysql-test/main/cast.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/main/cast.test b/mysql-test/main/cast.test index f48d6d9f95f..165980aebed 100644 --- a/mysql-test/main/cast.test +++ b/mysql-test/main/cast.test @@ -393,6 +393,7 @@ DROP TABLE t1; --echo # Bug #11765023: 57934: DOS POSSIBLE SINCE BINARY CASTING --echo # DOESN'T ADHERE TO MAX_ALLOWED_PACKET +set @save_max_allowed_packet=@@global.max_allowed_packet; SET @@GLOBAL.max_allowed_packet=2048; # reconnect to make the new max packet size take effect --connect (newconn, localhost, root,,) @@ -403,7 +404,7 @@ SELECT length(CONVERT(repeat('a',2048), CHAR(2049))); connection default; disconnect newconn; -SET @@GLOBAL.max_allowed_packet=default; +SET @@GLOBAL.max_allowed_packet=@save_max_allowed_packet; --echo # --echo # Bug#13519724 63793: CRASH IN DTCOLLATION::SET(DTCOLLATION &SET) |