Skip to content

Commit 1905919

Browse files
committed
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)
1 parent e68f740 commit 1905919

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

mysql-test/suite/vcol/r/wrong_arena.result

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ connection default;
4040
select * from t1;
4141
a b c d e
4242
2010-10-10 10:10:10 1 0 0 NULL
43-
Warnings:
44-
Warning 1292 Incorrect datetime value: '1'
45-
Warning 1292 Incorrect datetime value: '2'
46-
Warning 1292 Incorrect datetime value: '1'
47-
Warning 1292 Incorrect datetime value: '1'
48-
Warning 1292 Incorrect datetime value: '2'
4943
drop table t1;
5044
connect con1, localhost, root;
5145
create table t1 (a datetime,

mysql-test/suite/vcol/t/wrong_arena.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@ create table t1 (a datetime,
1616
);
1717
show create table t1;
1818
connect con1, localhost, root;
19+
disable_warnings;
1920
insert t1 (a) values ('2010-10-10 10:10:10');
21+
enable_warnings;
2022
select * from t1;
2123
disconnect con1;
2224
connection default;
25+
disable_warnings;
2326
select * from t1;
27+
enable_warnings;
2428
drop table t1;
2529

2630
connect con1, localhost, root;

mysql-test/t/mdev-504.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--source include/not_valgrind.inc
2-
--disable_ps_protocol
2+
--source include/no_protocol.inc
33

44
SET GLOBAL net_write_timeout = 900;
55

0 commit comments

Comments
 (0)