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/bootstrap.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/bootstrap.test')
| -rw-r--r-- | mysql-test/main/bootstrap.test | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/main/bootstrap.test b/mysql-test/main/bootstrap.test index 97f5da86096..cd13a2748d1 100644 --- a/mysql-test/main/bootstrap.test +++ b/mysql-test/main/bootstrap.test @@ -33,10 +33,11 @@ drop table t1; remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_error.sql; # -# Bootstrap with a query larger than 2*thd->net.max_packet +# Bootstrap with a large thd->net.max_packet # set @my_max_allowed_packet= @@max_allowed_packet; -set global max_allowed_packet=64*@@max_allowed_packet; +set @@global.max_allowed_packet= greatest(1073741824, @@max_allowed_packet); +set @max_allowed_packed=@@global.max_allowed_packet; --disable_query_log create table t1 select 2 as a, concat(repeat('MySQL', @@max_allowed_packet/10), ';') as b; eval select * into outfile '$MYSQLTEST_VARDIR/tmp/long_query.sql' from t1; |