diff --git a/mysql-test/r/information_schema-big.result b/mysql-test/r/information_schema-big.result index d0973af1741..3d4fa27859d 100644 --- a/mysql-test/r/information_schema-big.result +++ b/mysql-test/r/information_schema-big.result @@ -54,7 +54,6 @@ TRIGGERS TRIGGER_SCHEMA USER_PRIVILEGES GRANTEE USER_STATISTICS USER VIEWS TABLE_SCHEMA -PBXT_STATISTICS ID XTRADB_ADMIN_COMMAND result_message SELECT t.table_name, c1.column_name FROM information_schema.tables t @@ -107,5 +106,4 @@ TRIGGERS TRIGGER_SCHEMA USER_PRIVILEGES GRANTEE USER_STATISTICS USER VIEWS TABLE_SCHEMA -PBXT_STATISTICS ID XTRADB_ADMIN_COMMAND result_message diff --git a/mysql-test/t/variables-big.test b/mysql-test/t/variables-big.test index 60d83e92c0a..58098f4c879 100644 --- a/mysql-test/t/variables-big.test +++ b/mysql-test/t/variables-big.test @@ -74,5 +74,3 @@ SET SESSION transaction_prealloc_size=1024*1024*1024*5; SHOW PROCESSLIST; --enable_warnings -SET @@session.transaction_prealloc_size= @def_var; - diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 6190751aadc..09c489c5905 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -340,9 +340,4 @@ IF(WIN32) mysql_upgrade_service.cc COMPONENT Server) TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) -ENDIF() - -ADD_CUSTOM_TARGET(show-dist-name - COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}" -) - +ENDIF(WIN32)