database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

after-merge fixes

Browse Source
This commit is contained in:
Sergei Golubchik
2015-01-21 14:02:26 +01:00
parent d9c01e4b4a
commit ff55d900fb
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/libutils.cmake
View File

@@ -304,6 +304,8 @@ FUNCTION(GET_DEPENDEND_OS_LIBS target result)
SET(${result} ${ret} PARENT_SCOPE) SET(${result} ${ret} PARENT_SCOPE)
ENDFUNCTION() ENDFUNCTION()
INCLUDE(CheckCCompilerFlag)
SET(VISIBILITY_HIDDEN_FLAG) SET(VISIBILITY_HIDDEN_FLAG)
IF(CMAKE_COMPILER_IS_GNUCXX AND UNIX) IF(CMAKE_COMPILER_IS_GNUCXX AND UNIX)

5
mysql-test/suite/innodb/t/insert_debug.test
View File

@@ -2,6 +2,11 @@
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_partition.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 #
--echo # Bug#19904003 INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=1 --echo # Bug#19904003 INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=1
--echo # CAUSES INFINITE PAGE SPLIT --echo # CAUSES INFINITE PAGE SPLIT

5
mysql-test/suite/innodb/t/sp_temp_table.test
View File

@@ -1,6 +1,11 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/big_test.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 #
--echo # Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE --echo # Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE
--echo # CALLED FROM A FUNCTION --echo # CALLED FROM A FUNCTION

3
storage/tokudb/mysql-test/tokudb_bugs/disabled.def
View File

@@ -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 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