diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-01 18:54:15 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-01 19:32:36 +0200 |
| commit | 190591968ec3f38a2c33fc15e9b157f3dc8e3209 (patch) | |
| tree | bda9159315121d3ea9d7168baddfff3b7206a0f6 | |
| parent | e68f7402c5b918d8143c2b67dfe6db3eb184d8be (diff) | |
| download | mariadb-git-190591968ec3f38a2c33fc15e9b157f3dc8e3209.tar.gz | |
vcol.wrong_arena fails in fulltest
vcols in the table definition are intentionaly bad and produce
warnings when a table is opened. In some cases (depending on the
TDC/TC state as left by earlier tests) a table might be opened in the
middle of the test, resulting in spurious warnings. Suppress them.
Also, don't run main.mdev-504 for ps-protocol at all (instead of
disabling ps-protocol inside the test, but still running the test)
| -rw-r--r-- | mysql-test/suite/vcol/r/wrong_arena.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/t/wrong_arena.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/mdev-504.test | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/mysql-test/suite/vcol/r/wrong_arena.result b/mysql-test/suite/vcol/r/wrong_arena.result index 8a07c828288..e86026852e4 100644 --- a/mysql-test/suite/vcol/r/wrong_arena.result +++ b/mysql-test/suite/vcol/r/wrong_arena.result @@ -40,12 +40,6 @@ connection default; select * from t1; a b c d e 2010-10-10 10:10:10 1 0 0 NULL -Warnings: -Warning 1292 Incorrect datetime value: '1' -Warning 1292 Incorrect datetime value: '2' -Warning 1292 Incorrect datetime value: '1' -Warning 1292 Incorrect datetime value: '1' -Warning 1292 Incorrect datetime value: '2' drop table t1; connect con1, localhost, root; create table t1 (a datetime, diff --git a/mysql-test/suite/vcol/t/wrong_arena.test b/mysql-test/suite/vcol/t/wrong_arena.test index 484f1fe685d..340634422ae 100644 --- a/mysql-test/suite/vcol/t/wrong_arena.test +++ b/mysql-test/suite/vcol/t/wrong_arena.test @@ -16,11 +16,15 @@ create table t1 (a datetime, ); show create table t1; connect con1, localhost, root; +disable_warnings; insert t1 (a) values ('2010-10-10 10:10:10'); +enable_warnings; select * from t1; disconnect con1; connection default; +disable_warnings; select * from t1; +enable_warnings; drop table t1; connect con1, localhost, root; diff --git a/mysql-test/t/mdev-504.test b/mysql-test/t/mdev-504.test index 76232927cd9..551c21c37d0 100644 --- a/mysql-test/t/mdev-504.test +++ b/mysql-test/t/mdev-504.test @@ -1,5 +1,5 @@ --source include/not_valgrind.inc ---disable_ps_protocol +--source include/no_protocol.inc SET GLOBAL net_write_timeout = 900; |