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/alter_table.result | |
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/alter_table.result')
-rw-r--r-- | mysql-test/main/alter_table.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result index b5f81642db2..3d21b5c350d 100644 --- a/mysql-test/main/alter_table.result +++ b/mysql-test/main/alter_table.result @@ -1,5 +1,6 @@ drop table if exists t1,t2; drop database if exists mysqltest; +set @save_max_allowed_packet=@@global.max_allowed_packet; create table t1 ( col1 int not null auto_increment primary key, col2 varchar(30) not null, @@ -1464,7 +1465,7 @@ disconnect con1; connection default; DROP TABLE t1, t2, t3; SET SQL_MODE=default; -SET GLOBAL max_allowed_packet=default; +SET GLOBAL max_allowed_packet=@save_max_allowed_packet; CREATE TABLE t1 ( id INT(11) NOT NULL, x_param INT(11) DEFAULT NULL, |