summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2014-03-18 16:26:02 +0200
committerMichael Widenius <monty@mariadb.org>2014-03-18 16:26:02 +0200
commit7b57dcb4634c1212d9eb4cd228167722d542d613 (patch)
tree55e1a5371643ff3f3c30c7c02d4c2fe9ac9f7b0f
parent1127d567357418d156822e4ebb9eb99b08514c2d (diff)
downloadmariadb-git-7b57dcb4634c1212d9eb4cd228167722d542d613.tar.gz
Fixed buildbot issues
mysql-test/suite/rpl/t/rpl_000011-slave.opt: Renamed test case as it's slave that needs to restarted support-files/compiler_warnings.supp: Fixed bad characters in suppression
-rw-r--r--mysql-test/suite/rpl/t/rpl_000011-slave.opt (renamed from mysql-test/suite/rpl/t/rpl_000011-master.opt)0
-rw-r--r--support-files/compiler_warnings.supp2
2 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_000011-master.opt b/mysql-test/suite/rpl/t/rpl_000011-slave.opt
index 7c3d2411b28..7c3d2411b28 100644
--- a/mysql-test/suite/rpl/t/rpl_000011-master.opt
+++ b/mysql-test/suite/rpl/t/rpl_000011-slave.opt
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index 21dfbbe0653..17021bc4ddc 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -49,7 +49,7 @@ ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000
fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits
log/log0log\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type
log/log0online\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type
-buf/buf0buf\.c : warning: label ~loop2~ defined but not used
+buf/buf0buf\.c : warning: label.*loop2.* defined but not used
#
# bdb is not critical to keep up to date