1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a couple of fixes for tests

Browse Source
This commit is contained in:
Sergei Golubchik 2012-01-31 17:12:44 +01:00
parent b6a82a7c5a
commit 26f3c33792
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/information_schema-big.result
View File

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

2
mysql-test/t/variables-big.test
View File

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

7
sql/CMakeLists.txt
View File

@ -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}"
)