diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 11:53:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 11:53:10 +0200 |
| commit | 244f0e6dd815b388282c15db4fe7f15533f4c8fc (patch) | |
| tree | af138f2b3739a742c0c38173cdc86ec176fc0edd /mysql-test/main/func_str.test | |
| parent | 18af13b88ba580562981a190c25da128a2e9db26 (diff) | |
| parent | 2842c369851a8afc2a944ce6f4f60fa052f20969 (diff) | |
| download | mariadb-git-244f0e6dd815b388282c15db4fe7f15533f4c8fc.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/main/func_str.test')
| -rw-r--r-- | mysql-test/main/func_str.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/main/func_str.test b/mysql-test/main/func_str.test index bc4ab2396f6..a01b3942209 100644 --- a/mysql-test/main/func_str.test +++ b/mysql-test/main/func_str.test @@ -6,6 +6,7 @@ drop table if exists t1,t2; --enable_warnings +set @save_max_allowed_packet=@@global.max_allowed_packet; set global max_allowed_packet=1048576; connect (conn1,localhost,root,,); connection conn1; @@ -1848,7 +1849,7 @@ EXECUTE stmt; disconnect conn1; connection default; -set global max_allowed_packet=default; +set global max_allowed_packet=@save_max_allowed_packet; --echo # --echo # End of 5.6 tests |