after-merge fixes

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)

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

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

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