Commit 26f3c337 authored by Sergei Golubchik's avatar Sergei Golubchik

a couple of fixes for tests

parent b6a82a7c
...@@ -54,7 +54,6 @@ TRIGGERS TRIGGER_SCHEMA ...@@ -54,7 +54,6 @@ TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE USER_PRIVILEGES GRANTEE
USER_STATISTICS USER USER_STATISTICS USER
VIEWS TABLE_SCHEMA VIEWS TABLE_SCHEMA
PBXT_STATISTICS ID
XTRADB_ADMIN_COMMAND result_message XTRADB_ADMIN_COMMAND result_message
SELECT t.table_name, c1.column_name SELECT t.table_name, c1.column_name
FROM information_schema.tables t FROM information_schema.tables t
...@@ -107,5 +106,4 @@ TRIGGERS TRIGGER_SCHEMA ...@@ -107,5 +106,4 @@ TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE USER_PRIVILEGES GRANTEE
USER_STATISTICS USER USER_STATISTICS USER
VIEWS TABLE_SCHEMA VIEWS TABLE_SCHEMA
PBXT_STATISTICS ID
XTRADB_ADMIN_COMMAND result_message XTRADB_ADMIN_COMMAND result_message
...@@ -74,5 +74,3 @@ SET SESSION transaction_prealloc_size=1024*1024*1024*5; ...@@ -74,5 +74,3 @@ SET SESSION transaction_prealloc_size=1024*1024*1024*5;
SHOW PROCESSLIST; SHOW PROCESSLIST;
--enable_warnings --enable_warnings
SET @@session.transaction_prealloc_size= @def_var;
...@@ -340,9 +340,4 @@ IF(WIN32) ...@@ -340,9 +340,4 @@ IF(WIN32)
mysql_upgrade_service.cc mysql_upgrade_service.cc
COMPONENT Server) COMPONENT Server)
TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
ENDIF() ENDIF(WIN32)
ADD_CUSTOM_TARGET(show-dist-name
COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"
)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment