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/func_json.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/func_json.test')
| -rw-r--r-- | mysql-test/main/func_json.test | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test index e557be85308..33f8a598670 100644 --- a/mysql-test/main/func_json.test +++ b/mysql-test/main/func_json.test @@ -265,6 +265,9 @@ SELECT JSON_search( '{"x": "\\""}', "one", '\\"'); # # MDEV-11833 JSON functions don't seem to respect max_allowed_packet. # +set @save_max_allowed_packet=@@max_allowed_packet; +set @save_net_buffer_length=@@net_buffer_length; + set @@global.net_buffer_length=1024; set @@global.max_allowed_packet=2048; --connect (newconn, localhost, root,,) @@ -275,8 +278,8 @@ select json_array(repeat('a',1024),repeat('a',1024)); select json_object("a", repeat('a',1024),"b", repeat('a',1024)); --connection default -set @@global.max_allowed_packet = default; -set @@global.net_buffer_length = default; +set @@global.max_allowed_packet = @save_max_allowed_packet; +set @@global.net_buffer_length = @save_net_buffer_length; --disconnect newconn |