Skip to content

Commit 9c059a4

Browse files
Spider: no need to check for ubsan when running ubsan tests
It's ok to run these tests without ubsan too, and we get some tests for free.
1 parent 653cb19 commit 9c059a4

File tree

4 files changed

+7
-30
lines changed

4 files changed

+7
-30
lines changed

storage/spider/mysql-test/spider/bugfix/r/mdev_26541.result

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,3 @@
22
# MDEV-26541 Undefined symbol: _ZTI12ha_partition when attempting to use ha_spider.so in UBSAN builds
33
#
44
INSTALL SONAME 'ha_spider.so';
5-
DROP FUNCTION spider_flush_table_mon_cache;
6-
DROP FUNCTION spider_copy_tables;
7-
DROP FUNCTION spider_ping_table;
8-
DROP FUNCTION spider_bg_direct_sql;
9-
DROP FUNCTION spider_direct_sql;
10-
UNINSTALL SONAME IF EXISTS "ha_spider";
11-
DROP TABLE IF EXISTS mysql.spider_xa;
12-
DROP TABLE IF EXISTS mysql.spider_xa_member;
13-
DROP TABLE IF EXISTS mysql.spider_xa_failed_log;
14-
DROP TABLE IF EXISTS mysql.spider_tables;
15-
DROP TABLE IF EXISTS mysql.spider_link_mon_servers;
16-
DROP TABLE IF EXISTS mysql.spider_link_failed_log;
17-
DROP TABLE IF EXISTS mysql.spider_table_position_for_recovery;
18-
DROP TABLE IF EXISTS mysql.spider_table_sts;
19-
DROP TABLE IF EXISTS mysql.spider_table_crd;

storage/spider/mysql-test/spider/bugfix/t/mdev_26541.test

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
--echo # MDEV-26541 Undefined symbol: _ZTI12ha_partition when attempting to use ha_spider.so in UBSAN builds
33
--echo #
44

5-
if (`select not(count(*)) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "%UBSAN%"`)
6-
{
7-
--skip test needs to be run with UBSAN
8-
}
5+
# this test should be checked with ubsan
96

107
# init spider
118

@@ -20,4 +17,5 @@ while (!$PLUGIN_EXIST)
2017
`SELECT COUNT(*) FROM mysql.func WHERE name = '$PLUGIN_NAME'`;
2118
}
2219

20+
--disable_query_log
2321
--source ../../include/clean_up_spider.inc

storage/spider/mysql-test/spider/bugfix/t/mdev_28998.test

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
--echo # MDEV-28998 ASAN errors in spider_fields::free_conn_holder or spider_create_group_by_handler
33
--echo #
44

5-
if (`select not(count(*)) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "%ASAN%"`)
6-
{
7-
--skip test needs to be run with ASAN
8-
}
5+
# this test should be checked with ubsan
96

107
--disable_query_log
118
--disable_result_log

storage/spider/mysql-test/spider/bugfix/t/mdev_30981.test

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,18 @@
22
--echo # MDEV-30981 Spider UBSAN: null pointer passed as argument 2, which is declared to never be null in spider_create_trx_alter_table on ALTER
33
--echo #
44

5-
if (`select not(count(*)) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "%UBSAN%"`)
6-
{
7-
--skip test needs to be run with UBSAN
8-
}
9-
5+
# this test should be checked with ubsan
6+
107
--disable_query_log
118
--disable_result_log
129
--source ../../t/test_init.inc
1310
--enable_result_log
1411
--enable_query_log
15-
12+
1613
CREATE TABLE t (c INT) ENGINE=Spider PARTITION BY LIST (c) (PARTITION p VALUES IN (1,2));
1714
ALTER TABLE t ENGINE=InnoDB;
1815
drop table t;
19-
16+
2017
--disable_query_log
2118
--disable_result_log
2219
--source ../t/test_deinit.inc

0 commit comments

Comments
 (0)