diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-01-21 14:02:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-01-21 14:02:26 +0100 |
| commit | ff55d900fbeb1d426e7737caef6748c3f13bf4e6 (patch) | |
| tree | e2bdecad651f7e77eab9bd1af11751d300049d4a | |
| parent | d9c01e4b4ac6a7e2bdbcaf71819fa3d4f5269840 (diff) | |
| download | mariadb-git-ff55d900fbeb1d426e7737caef6748c3f13bf4e6.tar.gz | |
after-merge fixes
| -rw-r--r-- | cmake/libutils.cmake | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/insert_debug.test | 5 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/sp_temp_table.test | 5 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb_bugs/disabled.def | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 8f85b988f8d..8fcfe294f17 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -304,6 +304,8 @@ FUNCTION(GET_DEPENDEND_OS_LIBS target result) SET(${result} ${ret} PARENT_SCOPE) ENDFUNCTION() +INCLUDE(CheckCCompilerFlag) + SET(VISIBILITY_HIDDEN_FLAG) IF(CMAKE_COMPILER_IS_GNUCXX AND UNIX) diff --git a/mysql-test/suite/innodb/t/insert_debug.test b/mysql-test/suite/innodb/t/insert_debug.test index 36ceba2ee8b..666b634bef9 100644 --- a/mysql-test/suite/innodb/t/insert_debug.test +++ b/mysql-test/suite/innodb/t/insert_debug.test @@ -2,6 +2,11 @@ --source include/have_debug.inc --source include/have_partition.inc +if (`select plugin_auth_version < "5.6.22" from information_schema.plugins where plugin_name='innodb'`) +{ + --skip Not fixed in InnoDB/XtraDB as of 5.6.21 or earlier +} + --echo # --echo # Bug#19904003 INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=1 --echo # CAUSES INFINITE PAGE SPLIT diff --git a/mysql-test/suite/innodb/t/sp_temp_table.test b/mysql-test/suite/innodb/t/sp_temp_table.test index b2883f551b9..9a6be85fd7e 100644 --- a/mysql-test/suite/innodb/t/sp_temp_table.test +++ b/mysql-test/suite/innodb/t/sp_temp_table.test @@ -1,6 +1,11 @@ --source include/have_innodb.inc --source include/big_test.inc +if (`select plugin_auth_version < "5.6.22" from information_schema.plugins where plugin_name='innodb'`) +{ + --skip Not fixed in InnoDB/XtraDB as of 5.6.21 or earlier +} + --echo # --echo # Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE --echo # CALLED FROM A FUNCTION diff --git a/storage/tokudb/mysql-test/tokudb_bugs/disabled.def b/storage/tokudb/mysql-test/tokudb_bugs/disabled.def index 0bf13a5e86e..86d38a530da 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/disabled.def +++ b/storage/tokudb/mysql-test/tokudb_bugs/disabled.def @@ -9,3 +9,6 @@ fileops-3: how this could work, if alter needs an exclusive mdl lock? checkpoint_lock_2: test can not work when the checkpoint_safe_lock is a fair rwlock +# this test was added in 7.5.4 and fails in 10.0 +# but running this very test in 7.5.3 fails in exactly the same manner +db768: never worked. tokutek was informed, 2015-01-14 |