From: Dmitry Teselkin Date: Wed, 7 Feb 2018 15:24:42 +0000 (+0300) Subject: mysql-wsrep-5.6.39 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F37811%2F1;p=packages%2Ftrusty%2Fmysql-wsrep-5.6.git mysql-wsrep-5.6.39 * Import from codership repository https://github.com/codership/mysql-wsrep/tree/wsrep_5.6.39-25.22 Change-Id: Iebaf1e1589cee081cbf221e263b001b116857ae9 Related-Bug: #1745096 --- diff --git a/debian/changelog b/debian/changelog index 0eaf93f3..50ca12b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mysql-wsrep-5.6 (5.6.39-0~u14.04+mos0) mos; urgency=medium + + * Import mysql-wsrep-5.6.39 from codership + https://github.com/codership/mysql-wsrep/tree/wsrep_5.6.39-25.22 + + -- Dmitry Teselkin Wed, 07 Feb 2018 18:23:29 +0300 + mysql-wsrep-5.6 (5.6.38-0~u14.04+mos0) mos; urgency=medium * Update mysql-wsrep to 5.6.38-25.21 diff --git a/mysql-wsrep-5.6/.gitattributes b/mysql-wsrep-5.6/.gitattributes new file mode 100644 index 00000000..59661532 --- /dev/null +++ b/mysql-wsrep-5.6/.gitattributes @@ -0,0 +1,2 @@ +.gitattributes export-ignore +.gitignore export-ignore diff --git a/mysql-wsrep-5.6/README b/mysql-wsrep-5.6/README index fdda76b4..8ef1894b 100644 --- a/mysql-wsrep-5.6/README +++ b/mysql-wsrep-5.6/README @@ -5,7 +5,7 @@ For the avoidance of doubt, this particular copy of the software is released under the version 2 of the GNU General Public License. MySQL is brought to you by Oracle. -Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. License information can be found in the COPYING file. diff --git a/mysql-wsrep-5.6/VERSION b/mysql-wsrep-5.6/VERSION index 028a264d..0afdda61 100644 --- a/mysql-wsrep-5.6/VERSION +++ b/mysql-wsrep-5.6/VERSION @@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=6 -MYSQL_VERSION_PATCH=38 +MYSQL_VERSION_PATCH=39 MYSQL_VERSION_EXTRA= diff --git a/mysql-wsrep-5.6/client/CMakeLists.txt b/mysql-wsrep-5.6/client/CMakeLists.txt index d24555a5..62694775 100644 --- a/mysql-wsrep-5.6/client/CMakeLists.txt +++ b/mysql-wsrep-5.6/client/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ ENDIF(UNIX) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) - +ADD_DEPENDENCIES(mysqltest GenError) MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) diff --git a/mysql-wsrep-5.6/cmake/build_configurations/mysql_release.cmake b/mysql-wsrep-5.6/cmake/build_configurations/mysql_release.cmake index 87dd43a5..219179c3 100644 --- a/mysql-wsrep-5.6/cmake/build_configurations/mysql_release.cmake +++ b/mysql-wsrep-5.6/cmake/build_configurations/mysql_release.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,13 +25,6 @@ IF(NOT COMPILATION_COMMENT) SET(COMPILATION_COMMENT "MySQL Community Server (GPL)") ENDIF() -IF(WIN32) - IF(NOT CMAKE_USING_VC_FREE_TOOLS) - # Sign executables with authenticode certificate - SET(SIGNCODE 1 CACHE BOOL "") - ENDIF() -ENDIF() - IF(UNIX) SET(WITH_EXTRA_CHARSETS all CACHE STRING "") diff --git a/mysql-wsrep-5.6/cmake/install_macros.cmake b/mysql-wsrep-5.6/cmake/install_macros.cmake index 4f660083..c082ad2f 100644 --- a/mysql-wsrep-5.6/cmake/install_macros.cmake +++ b/mysql-wsrep-5.6/cmake/install_macros.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -177,60 +177,6 @@ IF(UNIX) ENDIF() ENDMACRO() -IF(WIN32) - OPTION(SIGNCODE "Sign executables and dlls with digital certificate" OFF) - MARK_AS_ADVANCED(SIGNCODE) - IF(SIGNCODE) - SET(SIGNTOOL_PARAMETERS - /a /t http://timestamp.verisign.com/scripts/timstamp.dll - CACHE STRING "parameters for signtool (list)") - FIND_PROGRAM(SIGNTOOL_EXECUTABLE signtool) - IF(NOT SIGNTOOL_EXECUTABLE) - MESSAGE(FATAL_ERROR - "signtool is not found. Signing executables not possible") - ENDIF() - IF(NOT DEFINED SIGNCODE_ENABLED) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/testsign.c "int main(){return 0;}") - MAKE_DIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/testsign) - TRY_COMPILE(RESULT ${CMAKE_CURRENT_BINARY_DIR}/testsign ${CMAKE_CURRENT_BINARY_DIR}/testsign.c - COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/testsign.exe - ) - - EXECUTE_PROCESS(COMMAND - ${SIGNTOOL_EXECUTABLE} sign ${SIGNTOOL_PARAMETERS} ${CMAKE_CURRENT_BINARY_DIR}/testsign.exe - RESULT_VARIABLE ERR ERROR_QUIET OUTPUT_QUIET - ) - IF(ERR EQUAL 0) - SET(SIGNCODE_ENABLED 1 CACHE INTERNAL "Can sign executables") - ELSE() - MESSAGE(STATUS "Disable authenticode signing for executables") - SET(SIGNCODE_ENABLED 0 CACHE INTERNAL "Invalid or missing certificate") - ENDIF() - ENDIF() - MARK_AS_ADVANCED(SIGNTOOL_EXECUTABLE SIGNTOOL_PARAMETERS) - ENDIF() -ENDIF() - -MACRO(SIGN_TARGET target) - GET_TARGET_PROPERTY(target_type ${target} TYPE) - IF(target_type AND NOT target_type MATCHES "STATIC") - GET_TARGET_PROPERTY(target_location ${target} LOCATION) - IF(CMAKE_GENERATOR MATCHES "Visual Studio") - STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}" - target_location ${target_location}) - ENDIF() - INSTALL(CODE - "EXECUTE_PROCESS(COMMAND - ${SIGNTOOL_EXECUTABLE} sign ${SIGNTOOL_PARAMETERS} ${target_location} - RESULT_VARIABLE ERR) - IF(NOT \${ERR} EQUAL 0) - MESSAGE(FATAL_ERROR \"Error signing ${target_location}\") - ENDIF() - ") - ENDIF() -ENDMACRO() - - # Installs targets, also installs pdbs on Windows. # # @@ -251,10 +197,6 @@ FUNCTION(MYSQL_INSTALL_TARGETS) FOREACH(target ${TARGETS}) - # If signing is required, sign executables before installing - IF(SIGNCODE AND SIGNCODE_ENABLED) - SIGN_TARGET(${target}) - ENDIF() # Install man pages on Unix IF(UNIX) GET_TARGET_PROPERTY(target_location ${target} LOCATION) diff --git a/mysql-wsrep-5.6/cmake/mysql_add_executable.cmake b/mysql-wsrep-5.6/cmake/mysql_add_executable.cmake index b1e1d312..bcbbe7d4 100644 --- a/mysql-wsrep-5.6/cmake/mysql_add_executable.cmake +++ b/mysql-wsrep-5.6/cmake/mysql_add_executable.cmake @@ -1,48 +1,48 @@ -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Add executable plus some additional MySQL specific stuff -# Usage (same as for standard CMake's ADD_EXECUTABLE) -# -# MYSQL_ADD_EXECUTABLE(target source1...sourceN) -# -# MySQL specifics: -# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory -# On Windows : -# - add version resource -# - instruct CPack to do autenticode signing if SIGNCODE is set - -INCLUDE(cmake_parse_arguments) - -FUNCTION (MYSQL_ADD_EXECUTABLE) - # Pass-through arguments for ADD_EXECUTABLE - MYSQL_PARSE_ARGUMENTS(ARG - "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT" - "" - ${ARGN} - ) - LIST(GET ARG_DEFAULT_ARGS 0 target) - LIST(REMOVE_AT ARG_DEFAULT_ARGS 0) - - SET(sources ${ARG_DEFAULT_ARGS}) - ADD_VERSION_INFO(${target} EXECUTABLE sources) - ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources}) - # tell CPack where to install - IF(NOT ARG_EXCLUDE_FROM_ALL) - IF(NOT ARG_DESTINATION) - SET(ARG_DESTINATION ${INSTALL_BINDIR}) +# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +# Add executable plus some additional MySQL specific stuff +# Usage (same as for standard CMake's ADD_EXECUTABLE) +# +# MYSQL_ADD_EXECUTABLE(target source1...sourceN) +# +# MySQL specifics: +# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory +# On Windows : +# - add version resource +# - instruct CPack to do autenticode signing if SIGNCODE is set + +INCLUDE(cmake_parse_arguments) + +FUNCTION (MYSQL_ADD_EXECUTABLE) + # Pass-through arguments for ADD_EXECUTABLE + MYSQL_PARSE_ARGUMENTS(ARG + "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT" + "" + ${ARGN} + ) + LIST(GET ARG_DEFAULT_ARGS 0 target) + LIST(REMOVE_AT ARG_DEFAULT_ARGS 0) + + SET(sources ${ARG_DEFAULT_ARGS}) + ADD_VERSION_INFO(${target} EXECUTABLE sources) + ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources}) + # tell CPack where to install + IF(NOT ARG_EXCLUDE_FROM_ALL) + IF(NOT ARG_DESTINATION) + SET(ARG_DESTINATION ${INSTALL_BINDIR}) ENDIF() IF(ARG_COMPONENT) SET(COMP COMPONENT ${ARG_COMPONENT}) @@ -50,7 +50,7 @@ FUNCTION (MYSQL_ADD_EXECUTABLE) SET(COMP COMPONENT ${MYSQL_INSTALL_COMPONENT}) ELSE() SET(COMP COMPONENT Client) - ENDIF() - MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP}) - ENDIF() + ENDIF() + MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP}) + ENDIF() ENDFUNCTION() diff --git a/mysql-wsrep-5.6/cmake/ssl.cmake b/mysql-wsrep-5.6/cmake/ssl.cmake index 8108f904..a576acbf 100644 --- a/mysql-wsrep-5.6/cmake/ssl.cmake +++ b/mysql-wsrep-5.6/cmake/ssl.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -269,7 +269,9 @@ MACRO (COPY_OPENSSL_DLLS target_name) GET_FILENAME_COMPONENT(OPENSSL_NAME "${OPENSSL_LIBRARY}" NAME_WE) FILE(GLOB HAVE_CRYPTO_DLL "${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll") FILE(GLOB HAVE_OPENSSL_DLL "${WITH_SSL_PATH}/bin/${OPENSSL_NAME}.dll") - IF (HAVE_CRYPTO_DLL AND HAVE_OPENSSL_DLL) + MESSAGE(STATUS "HAVE_CRYPTO_DLL ${HAVE_CRYPTO_DLL}") + MESSAGE(STATUS "HAVE_OPENSSL_DLL ${HAVE_OPENSSL_DLL}") + IF(HAVE_CRYPTO_DLL AND HAVE_OPENSSL_DLL) ADD_CUSTOM_COMMAND(OUTPUT ${target_name} COMMAND ${CMAKE_COMMAND} -E copy_if_different "${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll" diff --git a/mysql-wsrep-5.6/cmake/wsrep.cmake b/mysql-wsrep-5.6/cmake/wsrep.cmake index 28cb95b5..87ba3d00 100644 --- a/mysql-wsrep-5.6/cmake/wsrep.cmake +++ b/mysql-wsrep-5.6/cmake/wsrep.cmake @@ -17,7 +17,7 @@ # so WSREP_VERSION is produced regardless # Set the patch version -SET(WSREP_PATCH_VERSION "21") +SET(WSREP_PATCH_VERSION "22") # Obtain patch revision number SET(WSREP_REVISION $ENV{WSREP_REV}) diff --git a/mysql-wsrep-5.6/extra/CMakeLists.txt b/mysql-wsrep-5.6/extra/CMakeLists.txt index 886691a0..ceea4140 100644 --- a/mysql-wsrep-5.6/extra/CMakeLists.txt +++ b/mysql-wsrep-5.6/extra/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -95,6 +95,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) ) MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) + ADD_DEPENDENCIES(innochecksum GenError) ENDIF() IF(UNIX) diff --git a/mysql-wsrep-5.6/include/crypt_genhash_impl.h b/mysql-wsrep-5.6/include/crypt_genhash_impl.h index 828cf198..0e629b44 100644 --- a/mysql-wsrep-5.6/include/crypt_genhash_impl.h +++ b/mysql-wsrep-5.6/include/crypt_genhash_impl.h @@ -1,8 +1,23 @@ +/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + #ifndef CRYPT_HASHGEN_IMPL_H #define CRYPT_HASHGEN_IMPL_H #define ROUNDS_DEFAULT 5000 #define ROUNDS_MIN 1000 -#define ROUNDS_MAX 999999999 +#define ROUNDS_MAX ROUNDS_DEFAULT #define MIXCHARS 32 #define CRYPT_SALT_LENGTH 20 #define CRYPT_MAGIC_LENGTH 3 @@ -13,6 +28,8 @@ CRYPT_MAGIC_LENGTH + \ CRYPT_PARAM_LENGTH) +#define MAX_PLAINTEXT_LENGTH 256 + #include #include diff --git a/mysql-wsrep-5.6/include/welcome_copyright_notice.h b/mysql-wsrep-5.6/include/welcome_copyright_notice.h index 0c17b5e6..2b304d57 100644 --- a/mysql-wsrep-5.6/include/welcome_copyright_notice.h +++ b/mysql-wsrep-5.6/include/welcome_copyright_notice.h @@ -16,7 +16,7 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ -#define COPYRIGHT_NOTICE_CURRENT_YEAR "2017" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2018" /* This define specifies copyright notice which is displayed by every MySQL diff --git a/mysql-wsrep-5.6/libmysql/CMakeLists.txt b/mysql-wsrep-5.6/libmysql/CMakeLists.txt index 7b9c7626..fe2dda6b 100644 --- a/mysql-wsrep-5.6/libmysql/CMakeLists.txt +++ b/mysql-wsrep-5.6/libmysql/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -253,7 +253,7 @@ IF(NOT DISABLE_SHARED) SET(libmysql_link_flags "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}") SET(libmysql_link_flags - "${libmysql_link_flags} -Wl,--version-script=libmysql.ver") + "${libmysql_link_flags} -Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver") SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS "${libmysql_link_flags}") ENDIF() diff --git a/mysql-wsrep-5.6/mysql-test/r/fulltext.result b/mysql-wsrep-5.6/mysql-test/r/fulltext.result index 34e567e1..3173bc01 100644 --- a/mysql-wsrep-5.6/mysql-test/r/fulltext.result +++ b/mysql-wsrep-5.6/mysql-test/r/fulltext.result @@ -695,3 +695,75 @@ CREATE TABLE q(b TEXT CHARSET latin1, fulltext(b)) engine=innodb; explain format=json SELECT 1 FROM q WHERE (SELECT MATCH(b) AGAINST ('*') FROM z); ERROR HY000: Incorrect arguments to MATCH DROP TABLE z, q; +# +# BUG#21625016: INNODB FULL TEXT CASE SENSITIVE NOT WORKING +# +CREATE TABLE t1(fld1 VARCHAR(10) COLLATE 'latin1_bin', FULLTEXT INDEX (fld1)) +ENGINE=InnoDB; +INSERT INTO t1 VALUES ('abCD'),('ABCD'); +# With the patch, case sensitive comparison is performed since +# binary collation is used. +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN BOOLEAN MODE); +fld1 +abCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN BOOLEAN MODE); +fld1 +ABCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN NATURAL LANGUAGE MODE); +fld1 +abCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN NATURAL LANGUAGE MODE); +fld1 +ABCD +# Since binary collation is not used, case insensitive comparison is +# performed. +ALTER TABLE t1 MODIFY fld1 VARCHAR(10) COLLATE 'latin1_general_cs'; +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN BOOLEAN MODE); +fld1 +abCD +ABCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN BOOLEAN MODE); +fld1 +abCD +ABCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN NATURAL LANGUAGE MODE); +fld1 +abCD +ABCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN NATURAL LANGUAGE MODE); +fld1 +abCD +ABCD +# With the patch, case sensitive comparison is performed. +ALTER TABLE t1 MODIFY fld1 VARCHAR(10) COLLATE 'utf8mb4_bin'; +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN BOOLEAN MODE); +fld1 +abCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN BOOLEAN MODE); +fld1 +ABCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN NATURAL LANGUAGE MODE); +fld1 +abCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN NATURAL LANGUAGE MODE); +fld1 +ABCD +# Test(using case insensitive collation) added for coverage +ALTER TABLE t1 MODIFY fld1 VARCHAR(10) COLLATE 'utf8mb4_general_ci'; +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN BOOLEAN MODE); +fld1 +abCD +ABCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN BOOLEAN MODE); +fld1 +abCD +ABCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN NATURAL LANGUAGE MODE); +fld1 +abCD +ABCD +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN NATURAL LANGUAGE MODE); +fld1 +abCD +ABCD +DROP TABLE t1; diff --git a/mysql-wsrep-5.6/mysql-test/r/group_min_max_innodb.result b/mysql-wsrep-5.6/mysql-test/r/group_min_max_innodb.result index ef4fe646..1b4ea084 100644 --- a/mysql-wsrep-5.6/mysql-test/r/group_min_max_innodb.result +++ b/mysql-wsrep-5.6/mysql-test/r/group_min_max_innodb.result @@ -559,3 +559,30 @@ c1 2 10 DROP TABLE t1; +# +# Bug #25989915: LOOSE INDEX SCANS RETURNING WRONG RESULT +# +CREATE TABLE t1 ( +pk INT NOT NULL AUTO_INCREMENT, +c1 varchar(100) DEFAULT NULL, +c2 INT NOT NULL, +PRIMARY KEY (pk), +UNIQUE KEY ukey (c2,c1) +)ENGINE=INNODB; +INSERT INTO t1(pk, c2) VALUES (100, 0), (101, 0), (102, 0), (103, 0); +ANALYZE TABLE t1; +Table Op Msg_type Msg_text +test.t1 analyze status OK +EXPLAIN SELECT COUNT(DISTINCT(c2)) FROM t1 WHERE pk IN (102, 101); +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 index PRIMARY,ukey ukey 107 NULL 4 Using where; Using index +EXPLAIN SELECT COUNT(DISTINCT(c2)) FROM t1 WHERE pk IN (102, 100); +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 index PRIMARY,ukey ukey 107 NULL 4 Using where; Using index +SELECT COUNT(DISTINCT(c2)) FROM t1 WHERE pk IN (102, 101); +COUNT(DISTINCT(c2)) +1 +SELECT COUNT(DISTINCT(c2)) FROM t1 WHERE pk IN (102, 100); +COUNT(DISTINCT(c2)) +1 +DROP TABLE t1; diff --git a/mysql-wsrep-5.6/mysql-test/r/information_schema.result b/mysql-wsrep-5.6/mysql-test/r/information_schema.result index 149babcb..2d621c96 100644 --- a/mysql-wsrep-5.6/mysql-test/r/information_schema.result +++ b/mysql-wsrep-5.6/mysql-test/r/information_schema.result @@ -2112,5 +2112,21 @@ DROP TABLE t1; CREATE PROCEDURE information_schema.is() BEGIN END; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' # +# Bug#26877788 SELECT FROM INFORMATION_SCHEMA.FILES RETURNS NO RECORDS WHEN ORDER BY IS USED +# +SELECT ENGINE, SUPPORT, TRANSACTIONS FROM INFORMATION_SCHEMA.ENGINES +WHERE +SUPPORT IN ( +SELECT DISTINCT SUPPORT +FROM INFORMATION_SCHEMA.ENGINES +WHERE +ENGINE IN ( +SELECT DISTINCT ENGINE FROM INFORMATION_SCHEMA.ENGINES +WHERE ENGINE IN ('MEMORY'))) +ORDER BY ENGINE +LIMIT 1; +ENGINE SUPPORT TRANSACTIONS +ARCHIVE YES NO +# # End of 5.6 tests # diff --git a/mysql-wsrep-5.6/mysql-test/r/mysql_config_editor.result b/mysql-wsrep-5.6/mysql-test/r/mysql_config_editor.result index 39504f74..7efe58f2 100644 --- a/mysql-wsrep-5.6/mysql-test/r/mysql_config_editor.result +++ b/mysql-wsrep-5.6/mysql-test/r/mysql_config_editor.result @@ -100,7 +100,7 @@ user = test_user4 ############################################## # Tests for mysql_config_editor's help command ############################################## -Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. Oracle is a registered trademark of Oracle Corporation and/or its affiliates. Other names may be trademarks of their respective diff --git a/mysql-wsrep-5.6/mysql-test/r/partition_innodb.result b/mysql-wsrep-5.6/mysql-test/r/partition_innodb.result index c50c4e2e..2245d6cc 100644 --- a/mysql-wsrep-5.6/mysql-test/r/partition_innodb.result +++ b/mysql-wsrep-5.6/mysql-test/r/partition_innodb.result @@ -875,3 +875,17 @@ t1 CREATE TABLE `t1` ( PARTITION p1 VALUES IN (1) DATA DIRECTORY = 'MYSQL_TMP_DIR/temp_dir' ENGINE = InnoDB) */ t1#p#p1.ibd DROP TABLE t1; + +Bug #26034430 ASSERTION `PART_REC_BUF_PTR' FAILED. + + +CREATE TABLE t1 ( a INT NOT NULL, b INT NOT NULL, c INT NOT NULL, PRIMARY KEY(a,b)) PARTITION BY RANGE (a)(PARTITION x1 VALUES LESS THAN (1)); +SELECT * FROM t1 WHERE (a = 1 and b = 1 and c = 'b') OR (a > 2) ORDER BY a DESC; +a b c +CREATE TABLE t(id INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, dttm DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, msg TEXT,PRIMARY KEY (id,dttm))ENGINE=INNODB DEFAULT CHARSET=UTF8MB4 ROW_FORMAT=DYNAMIC PARTITION BY RANGE COLUMNS(dttm) (PARTITION pf_201612 VALUES LESS THAN ('20170101') ENGINE = INNODB); +Warnings: +Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope. +Warning 1478 InnoDB: assuming ROW_FORMAT=COMPACT. +SELECT * FROM t WHERE dttm > '2017-01-19' ORDER BY id DESC; +id dttm msg +DROP TABLE t,t1; diff --git a/mysql-wsrep-5.6/mysql-test/suite/galera/r/MW-328A.result b/mysql-wsrep-5.6/mysql-test/suite/galera/r/MW-328A.result index daed2469..2de57de5 100644 --- a/mysql-wsrep-5.6/mysql-test/suite/galera/r/MW-328A.result +++ b/mysql-wsrep-5.6/mysql-test/suite/galera/r/MW-328A.result @@ -11,11 +11,21 @@ END WHILE; END| CALL proc_update();; SET SESSION wsrep_retry_autocommit = 0; -have_successes -1 -have_deadlocks -1 Got one of the listed errors DROP PROCEDURE proc_update; DROP TABLE t1, t2; CALL mtr.add_suppression("conflict state 3 after post commit"); +CREATE TABLE t1 (i int primary key, j int) engine=innodb; +INSERT INTO t1 values (1,0); +BEGIN; +UPDATE t1 SET j=1 WHERE i=1; +UPDATE t1 SET j=2 WHERE i=1; +COMMIT; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT * FROM t1; +i j +1 2 +SELECT * FROM t1; +i j +1 2 +DROP TABLE t1; diff --git a/mysql-wsrep-5.6/mysql-test/suite/galera/r/galera_defaults.result b/mysql-wsrep-5.6/mysql-test/suite/galera/r/galera_defaults.result index 8db446f4..ce9cd65d 100644 --- a/mysql-wsrep-5.6/mysql-test/suite/galera/r/galera_defaults.result +++ b/mysql-wsrep-5.6/mysql-test/suite/galera/r/galera_defaults.result @@ -47,7 +47,7 @@ WSREP_SST_DONOR WSREP_SST_DONOR_REJECTS_QUERIES OFF WSREP_SST_METHOD rsync WSREP_SYNC_WAIT 15 -; ; ; cert.log_conflicts = no; debug = no; evs.auto_evict = 0; evs.causal_keepalive_period = PT1S; evs.debug_log_mask = 0x1; evs.delay_margin = PT1S; evs.delayed_keep_period = PT30S; evs.inactive_check_period = PT0.5S; evs.inactive_timeout = PT30S; evs.info_log_mask = 0; evs.install_timeout = PT15S; evs.join_retrans_period = PT1S; evs.keepalive_period = PT1S; evs.max_install_timeouts = 3; evs.send_window = 4; evs.stats_report_period = PT1M; evs.suspect_timeout = PT10S; evs.use_aggregate = true; evs.user_send_window = 2; evs.version = 0; evs.view_forget_timeout = P1D; ; gcache.keep_pages_size = 0; gcache.mem_size = 0; ; gcache.page_size = 128M; gcache.recover = no; gcache.size = 128M; gcomm.thread_prio = ; gcs.fc_debug = 0; gcs.fc_factor = 1.0; gcs.fc_limit = 16; gcs.fc_master_slave = no; gcs.max_packet_size = 64500; gcs.max_throttle = 0.25; ;gcs.recv_q_soft_limit = 0.25; gcs.sync_donor = no; ; gmcast.mcast_addr = ; gmcast.mcast_ttl = 1; gmcast.peer_timeout = PT3S; gmcast.segment = 0; gmcast.time_wait = PT5S; gmcast.version = 0; ; pc.announce_timeout = PT3S; pc.checksum = false; pc.ignore_quorum = false; pc.ignore_sb = false; pc.linger = PT20S; pc.npvo = false; pc.recovery = true; pc.version = 0; pc.wait_prim = true; pc.wait_prim_timeout = PT30S; pc.weight = 1; protonet.backend = asio; protonet.version = 0; repl.causal_read_timeout = PT90S; repl.commit_order = 3; repl.key_format = FLAT8; repl.max_ws_size = 2147483647; repl.proto_max = 7; socket.checksum = 2; socket.recv_buf_size = 212992; +; ; ; cert.log_conflicts = no; debug = no; evs.auto_evict = 0; evs.causal_keepalive_period = PT1S; evs.debug_log_mask = 0x1; evs.delay_margin = PT1S; evs.delayed_keep_period = PT30S; evs.inactive_check_period = PT0.5S; evs.inactive_timeout = PT30S; evs.info_log_mask = 0; evs.install_timeout = PT15S; evs.join_retrans_period = PT1S; evs.keepalive_period = PT1S; evs.max_install_timeouts = 3; evs.send_window = 4; evs.stats_report_period = PT1M; evs.suspect_timeout = PT10S; evs.use_aggregate = true; evs.user_send_window = 2; evs.version = 0; evs.view_forget_timeout = P1D; ; gcache.keep_pages_size = 0; gcache.mem_size = 0; ; gcache.page_size = 128M; gcache.recover = no; gcache.size = 128M; gcomm.thread_prio = ; gcs.fc_debug = 0; gcs.fc_factor = 1.0; gcs.fc_limit = 16; gcs.fc_master_slave = no; gcs.max_packet_size = 64500; gcs.max_throttle = 0.25; ;gcs.recv_q_soft_limit = 0.25; gcs.sync_donor = no; ; gmcast.mcast_addr = ; gmcast.mcast_ttl = 1; gmcast.peer_timeout = PT3S; gmcast.segment = 0; gmcast.time_wait = PT5S; gmcast.version = 0; ; pc.announce_timeout = PT3S; pc.checksum = false; pc.ignore_quorum = false; pc.ignore_sb = false; pc.linger = PT20S; pc.npvo = false; pc.recovery = true; pc.version = 0; pc.wait_prim = true; pc.wait_prim_timeout = PT30S; pc.weight = 1; protonet.backend = asio; protonet.version = 0; repl.causal_read_timeout = PT90S; repl.commit_order = 3; repl.key_format = FLAT8; repl.max_ws_size = 2147483647; ;socket.checksum = 2; socket.recv_buf_size = 212992; SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'wsrep_%' AND VARIABLE_NAME != 'wsrep_debug_sync_waiters'; diff --git a/mysql-wsrep-5.6/mysql-test/suite/galera/r/galera_var_slave_threads.result b/mysql-wsrep-5.6/mysql-test/suite/galera/r/galera_var_slave_threads.result index 6b84f037..dbcb6c01 100644 --- a/mysql-wsrep-5.6/mysql-test/suite/galera/r/galera_var_slave_threads.result +++ b/mysql-wsrep-5.6/mysql-test/suite/galera/r/galera_var_slave_threads.result @@ -95,12 +95,157 @@ INSERT INTO t2 VALUES (DEFAULT); SELECT COUNT(*) = 64 FROM t2; COUNT(*) = 64 1 +SET wsrep_sync_wait=0; SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user'; COUNT(*) = @@wsrep_slave_threads + 1 1 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; COUNT(*) = 1 1 +SET GLOBAL wsrep_slave_threads = 5; SET GLOBAL wsrep_slave_threads = 1; +Shutting down server ... +SET wsrep_sync_wait=0; +show status like 'wsrep_cluster_size'; +Variable_name Value +wsrep_cluster_size 1 +SET GLOBAL wsrep_slave_threads = 6; +SET GLOBAL wsrep_slave_threads = 1; +SET GLOBAL wsrep_cluster_address=''; +SET GLOBAL wsrep_cluster_address='gcomm://'; +SET GLOBAL wsrep_slave_threads = 10; +SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user'; +COUNT(*) = @@wsrep_slave_threads + 1 +1 +SET GLOBAL wsrep_slave_threads = 1; +SET GLOBAL wsrep_slave_threads = 1; +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); +INSERT INTO t2 VALUES (DEFAULT); DROP TABLE t1; DROP TABLE t2; diff --git a/mysql-wsrep-5.6/mysql-test/suite/galera/t/MW-328A.test b/mysql-wsrep-5.6/mysql-test/suite/galera/t/MW-328A.test index 836dd088..da1040b3 100644 --- a/mysql-wsrep-5.6/mysql-test/suite/galera/t/MW-328A.test +++ b/mysql-wsrep-5.6/mysql-test/suite/galera/t/MW-328A.test @@ -3,8 +3,13 @@ # # -# Attempt to insert into t2 and check if insert actually inserted rows if -# a success was reported. +# test phase 1 is not deterministic +# +# Here we attempt to insert into t2 and check if insert actually +# inserted rows if a success was reported. +# +# However, deadlocks may or may not happen in this test execution +# it all depends on timing. # --source include/galera_cluster.inc @@ -23,7 +28,7 @@ while ($count) { TRUNCATE TABLE t2; - --error 0,1213 + --error 0,ER_LOCK_DEADLOCK INSERT IGNORE INTO t2 SELECT f2 FROM t1; if ($mysql_errno != 1213) { --inc $successes @@ -42,14 +47,31 @@ while ($count) --enable_query_log + +--source suite/galera/t/MW-328-footer.inc + # -# Check that the test produced both deadlocks and successes +# Test phase 2 is deterministic +# Here we generate a sure conflict in node 1 and verify that +# insert failed in both nodes # +--connection node_1 +CREATE TABLE t1 (i int primary key, j int) engine=innodb; +INSERT INTO t1 values (1,0); ---disable_query_log ---eval SELECT $successes > 0 AS have_successes ---eval SELECT $deadlocks > 0 AS have_deadlocks ---enable_query_log +BEGIN; +UPDATE t1 SET j=1 WHERE i=1; +--connection node_2 +UPDATE t1 SET j=2 WHERE i=1; ---source suite/galera/t/MW-328-footer.inc +--connection node_1 +--error ER_LOCK_DEADLOCK +COMMIT; + +SELECT * FROM t1; +--connection node_2 +SELECT * FROM t1; +--connection node_1 + +DROP TABLE t1; diff --git a/mysql-wsrep-5.6/mysql-test/suite/galera/t/galera_defaults.test b/mysql-wsrep-5.6/mysql-test/suite/galera/t/galera_defaults.test index d7c0b6f4..6662cfe4 100644 --- a/mysql-wsrep-5.6/mysql-test/suite/galera/t/galera_defaults.test +++ b/mysql-wsrep-5.6/mysql-test/suite/galera/t/galera_defaults.test @@ -47,6 +47,7 @@ ORDER BY VARIABLE_NAME; $wsrep_provider_options =~ s/signal = .*?;\s*//sgio; $wsrep_provider_options =~ s/dbug = .*?;\s*//sgio; $wsrep_provider_options =~ s/gcs.recv_q_hard_limit = .*?;\s*/;/sgio; + $wsrep_provider_options =~ s/repl.proto_max = .*?;\s*/;/sgio; print $wsrep_provider_options."\n"; EOF diff --git a/mysql-wsrep-5.6/mysql-test/suite/galera/t/galera_var_slave_threads.test b/mysql-wsrep-5.6/mysql-test/suite/galera/t/galera_var_slave_threads.test index a83924c1..fac688e2 100644 --- a/mysql-wsrep-5.6/mysql-test/suite/galera/t/galera_var_slave_threads.test +++ b/mysql-wsrep-5.6/mysql-test/suite/galera/t/galera_var_slave_threads.test @@ -59,12 +59,101 @@ while ($count) --connection node_2 SELECT COUNT(*) = 64 FROM t2; +SET wsrep_sync_wait=0; SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user'; SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; +--let $wsrep_cluster_address_node2 = `SELECT @@wsrep_cluster_address` +--let $wsrep_provider_node2 = `SELECT @@wsrep_provider` + +SET GLOBAL wsrep_slave_threads = 5; +--let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' +--source include/wait_condition.inc + +SET GLOBAL wsrep_slave_threads = 1; + +# +# test phase for bug https://github.com/codership/mysql-wsrep/issues/319 +# + +# shutdown node 2 +--connection node_2 +--echo Shutting down server ... +--source include/shutdown_mysqld.inc + +# wait until node_1 is ready as one node cluster +--connection node_1 +SET wsrep_sync_wait=0; +--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc +show status like 'wsrep_cluster_size'; + +# step up slave threads to 6, and make sure all appliers and rollbacker thread are running +SET GLOBAL wsrep_slave_threads = 6; +--let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' +--source include/wait_condition.inc + +# change to invalid cluster address +SET GLOBAL wsrep_slave_threads = 1; +SET GLOBAL wsrep_cluster_address=''; + +# join back to single node cluster +SET GLOBAL wsrep_cluster_address='gcomm://'; +--source include/wait_until_connected_again.inc + +# we should have 1 applier thread now +--let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' +--source include/wait_condition.inc + +# test if we can increase applier count now (fails in bug #319) +SET GLOBAL wsrep_slave_threads = 10; +--let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' +--source include/wait_condition.inc + +# restart node 2 +--connection node_2 +--source include/start_mysqld.inc +--source include/wait_until_connected_again.inc + +SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user'; + +# +# +# cleanup to original state +# +--connection node_1 --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig +--connection node_2 +--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig + +# Generate 64 replication events, to help node 1 to purge excessive applier threads +--let $count = 64 +while ($count) +{ + INSERT INTO t2 VALUES (DEFAULT); + --dec $count +} + +--connection node_1 +# Generate 64 replication events, to help node 2 to purge excessive applier threads +--let $count = 64 +while ($count) +{ + INSERT INTO t2 VALUES (DEFAULT); + --dec $count +} + +--let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' +--source include/wait_condition.inc + + +--connection node_2 + +--let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' +--source include/wait_condition.inc + DROP TABLE t1; DROP TABLE t2; diff --git a/mysql-wsrep-5.6/mysql-test/suite/innodb/r/timestamp.result b/mysql-wsrep-5.6/mysql-test/suite/innodb/r/timestamp.result new file mode 100644 index 00000000..db5bd58c --- /dev/null +++ b/mysql-wsrep-5.6/mysql-test/suite/innodb/r/timestamp.result @@ -0,0 +1,30 @@ +# +# Bug #47453: InnoDB incorrectly changes TIMESTAMP columns when +# JOINed during an UPDATE +# +CREATE TABLE t1 (d INT) ENGINE=InnoDB; +CREATE TABLE t2 (a INT, b INT, +c TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) +ON UPDATE CURRENT_TIMESTAMP(6)) ENGINE=InnoDB; +# set up our data elements +INSERT INTO t1 (d) VALUES (1); +INSERT INTO t2 (a,b) VALUES (1,1); +SELECT c INTO @bug47453 FROM t2; +SELECT c!=@bug47453 FROM t1 JOIN t2 ON d=a; +c!=@bug47453 +0 +UPDATE t1 JOIN t2 ON d=a SET b=1 WHERE a=1; +SELECT c!=@bug47453 FROM t1 JOIN t2 ON d=a; +c!=@bug47453 +0 +UPDATE t1 JOIN t2 ON d=a SET b=1; +# should be 0 +SELECT c!=@bug47453 FROM t1 JOIN t2 ON d=a; +c!=@bug47453 +0 +UPDATE t1 JOIN t2 ON d=a SET b=2; +# should not be 0 +SELECT c!=@bug47453 FROM t1 JOIN t2 ON d=a; +c!=@bug47453 +1 +DROP TABLE t1, t2; diff --git a/mysql-wsrep-5.6/mysql-test/suite/innodb/t/timestamp.test b/mysql-wsrep-5.6/mysql-test/suite/innodb/t/timestamp.test new file mode 100644 index 00000000..6ec5cfdd --- /dev/null +++ b/mysql-wsrep-5.6/mysql-test/suite/innodb/t/timestamp.test @@ -0,0 +1,26 @@ +--echo # +--echo # Bug #47453: InnoDB incorrectly changes TIMESTAMP columns when +--echo # JOINed during an UPDATE +--echo # + +CREATE TABLE t1 (d INT) ENGINE=InnoDB; +CREATE TABLE t2 (a INT, b INT, + c TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) + ON UPDATE CURRENT_TIMESTAMP(6)) ENGINE=InnoDB; + +--echo # set up our data elements +INSERT INTO t1 (d) VALUES (1); +INSERT INTO t2 (a,b) VALUES (1,1); +SELECT c INTO @bug47453 FROM t2; + +SELECT c!=@bug47453 FROM t1 JOIN t2 ON d=a; +UPDATE t1 JOIN t2 ON d=a SET b=1 WHERE a=1; +SELECT c!=@bug47453 FROM t1 JOIN t2 ON d=a; +UPDATE t1 JOIN t2 ON d=a SET b=1; +--echo # should be 0 +SELECT c!=@bug47453 FROM t1 JOIN t2 ON d=a; +UPDATE t1 JOIN t2 ON d=a SET b=2; +--echo # should not be 0 +SELECT c!=@bug47453 FROM t1 JOIN t2 ON d=a; + +DROP TABLE t1, t2; diff --git a/mysql-wsrep-5.6/mysql-test/suite/rpl/r/rpl_double_free_bug.result b/mysql-wsrep-5.6/mysql-test/suite/rpl/r/rpl_double_free_bug.result new file mode 100644 index 00000000..8c08e0f0 --- /dev/null +++ b/mysql-wsrep-5.6/mysql-test/suite/rpl/r/rpl_double_free_bug.result @@ -0,0 +1,35 @@ +#1) Create a master-slave topology with master's binlog_format=row. +include/master-slave.inc +Warnings: +Note #### Sending passwords in plain text without SSL/TLS is extremely insecure. +Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information. +[connection master] +#2) On slave, set slave_rows_search_algorithms= 'HASH_SCAN' and set a +# simulation point to fake a my_alloc_failure i.e, 'fake_malloc_failure'. +[connection slave] +call mtr.add_suppression("Slave SQL.*Could not execute Update_rows event on table test.t1"); +call mtr.add_suppression("Slave: Got error 1*"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); +SET @saved_slave_rows_search_algorithms= @@global.slave_rows_search_algorithms; +SET GLOBAL slave_rows_search_algorithms= 'HASH_SCAN'; +SET @old_debug= @@global.debug; +SET GLOBAL debug= '+d,fake_myalloc_failure'; +#3) On master, create a table, insert a row and do an update. +[connection master] +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1); +UPDATE t1 SET a=2 WHERE a=1; +#4) The update on master causes the slave sql thread to stop with Error 1030. +[connection slave] +include/wait_for_slave_sql_error.inc [errno=1030] +#5) Cleanup +SET GLOBAL debug= @old_debug; +SET GLOBAL slave_rows_search_algorithms= @saved_slave_rows_search_algorithms; +DROP TABLE t1; +[connection master] +DROP TABLE t1; +[connection slave] +include/wait_for_slave_sql_error.inc [errno=1030] +include/stop_slave_io.inc +RESET SLAVE; +include/rpl_end.inc diff --git a/mysql-wsrep-5.6/mysql-test/suite/rpl/t/rpl_double_free_bug.test b/mysql-wsrep-5.6/mysql-test/suite/rpl/t/rpl_double_free_bug.test new file mode 100644 index 00000000..61273700 --- /dev/null +++ b/mysql-wsrep-5.6/mysql-test/suite/rpl/t/rpl_double_free_bug.test @@ -0,0 +1,57 @@ +################################################################################ +# Bug#26952994 A DOUBLE-FREE ISSUE +# +# Problem: Slave crashes due to double free when there is an error in +# allocating memory in Hash_slave_rows::make_entry() function. +# +# Steps to reproduce: +# +# 1) Create a master-slave topology with master's binlog_format=row. +# 2) On slave, set slave_rows_search_algorithms= 'HASH_SCAN' and set a +# simulation point to fake a my_alloc_failure i.e, 'fake_myalloc_failure'. +# 3) On master, create a table, insert a row and do an update. +# 4) The update on master causes the slave sql thread to stop with Error 1030. +# 5) Cleanup. +# +################################################################################ +--echo #1) Create a master-slave topology with master's binlog_format=row. +--source include/have_debug.inc +--source include/have_binlog_format_row.inc +--source include/master-slave.inc + +--echo #2) On slave, set slave_rows_search_algorithms= 'HASH_SCAN' and set a +--echo # simulation point to fake a my_alloc_failure i.e, 'fake_malloc_failure'. +--source include/rpl_connection_slave.inc +call mtr.add_suppression("Slave SQL.*Could not execute Update_rows event on table test.t1"); +call mtr.add_suppression("Slave: Got error 1*"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); +SET @saved_slave_rows_search_algorithms= @@global.slave_rows_search_algorithms; +SET GLOBAL slave_rows_search_algorithms= 'HASH_SCAN'; +SET @old_debug= @@global.debug; +SET GLOBAL debug= '+d,fake_myalloc_failure'; + +--echo #3) On master, create a table, insert a row and do an update. +--source include/rpl_connection_master.inc +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1); +UPDATE t1 SET a=2 WHERE a=1; + +--echo #4) The update on master causes the slave sql thread to stop with Error 1030. +--source include/rpl_connection_slave.inc +--let $slave_sql_errno= convert_error(ER_GET_ERRNO) +--source include/wait_for_slave_sql_error.inc + +--echo #5) Cleanup +SET GLOBAL debug= @old_debug; +SET GLOBAL slave_rows_search_algorithms= @saved_slave_rows_search_algorithms; +DROP TABLE t1; +--source include/rpl_connection_master.inc +DROP TABLE t1; + +# Slave SQL thread has already stopped, stopping the IO trhead. +--source include/rpl_connection_slave.inc +--source include/wait_for_slave_sql_error.inc +--source include/stop_slave_io.inc +RESET SLAVE; +--let $rpl_only_running_threads= 1 +--source include/rpl_end.inc diff --git a/mysql-wsrep-5.6/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result b/mysql-wsrep-5.6/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result index daddc4af..fd23bfcb 100644 --- a/mysql-wsrep-5.6/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result +++ b/mysql-wsrep-5.6/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result @@ -10,7 +10,7 @@ j VARCHAR(255) SET GLOBAL log_output = 'file,table'; SET GLOBAL slow_query_log = on; SET SESSION long_query_time = 0; -SET GLOBAL log_slow_admin_statements = on; +SET GLOBAL log_slow_admin_statements = off; ALTER TABLE log_slow_admin_statements ADD COLUMN k INT DEFAULT 17; CREATE PROCEDURE add_rows() BEGIN @@ -24,6 +24,9 @@ END WHILE; END $ CALL add_rows(); +ANALYZE TABLE log_slow_admin_statements; +Table Op Msg_type Msg_text +test.log_slow_admin_statements analyze status OK OPTIMIZE TABLE log_slow_admin_statements; Table Op Msg_type Msg_text test.log_slow_admin_statements optimize note Table does not support optimize, doing recreate + analyze instead @@ -31,16 +34,37 @@ test.log_slow_admin_statements optimize status OK CHECK TABLE log_slow_admin_statements EXTENDED; Table Op Msg_type Msg_text test.log_slow_admin_statements check status OK +# Administrative sql statements must not be logged +SELECT count(sql_text)= 0 FROM mysql.slow_log +WHERE sql_text LIKE '%TABLE log_slow_admin_statements%'; +count(sql_text)= 0 +1 +SET GLOBAL log_slow_admin_statements = on; DROP TABLE log_slow_admin_statements; -SELECT sql_text FROM mysql.slow_log WHERE sql_text LIKE '%TABLE log_slow_admin_statements%'; -sql_text -ALTER TABLE log_slow_admin_statements ADD COLUMN k INT DEFAULT 17 -OPTIMIZE TABLE log_slow_admin_statements -CHECK TABLE log_slow_admin_statements EXTENDED -DROP TABLE log_slow_admin_statements +CREATE TABLE log_slow_admin_statements ( +i INT PRIMARY KEY AUTO_INCREMENT, +j VARCHAR(255) +) ENGINE=InnoDB; +CALL add_rows(); +ANALYZE TABLE log_slow_admin_statements; +Table Op Msg_type Msg_text +test.log_slow_admin_statements analyze status OK +OPTIMIZE TABLE log_slow_admin_statements; +Table Op Msg_type Msg_text +test.log_slow_admin_statements optimize note Table does not support optimize, doing recreate + analyze instead +test.log_slow_admin_statements optimize status OK +CHECK TABLE log_slow_admin_statements EXTENDED; +Table Op Msg_type Msg_text +test.log_slow_admin_statements check status OK +# At least one administrative sql statement must be logged in slow query log +SELECT count(sql_text)> 0 FROM mysql.slow_log +WHERE sql_text LIKE '%TABLE log_slow_admin_statements%'; +count(sql_text)> 0 +1 SET @@global.log_output= @old_log_output; SET @@global.slow_query_log= @old_slow_query_log; SET @@session.long_query_time= @old_long_query_time; SET @@global.log_slow_admin_statements= @old_log_slow_admin_statements; DROP PROCEDURE add_rows; +DROP TABLE log_slow_admin_statements; TRUNCATE TABLE mysql.slow_log; diff --git a/mysql-wsrep-5.6/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test b/mysql-wsrep-5.6/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test index 382edeca..1362a7eb 100644 --- a/mysql-wsrep-5.6/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test +++ b/mysql-wsrep-5.6/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test @@ -1,5 +1,6 @@ # check that CSV engine was compiled in --source include/have_csv.inc +--source include/no_valgrind_without_big.inc SET @old_log_output= @@global.log_output; SET @old_slow_query_log= @@global.slow_query_log; @@ -8,15 +9,15 @@ SET @old_log_slow_admin_statements= @@global.log_slow_admin_statements; USE test; CREATE TABLE log_slow_admin_statements ( - i INT PRIMARY KEY AUTO_INCREMENT, - j VARCHAR(255) + i INT PRIMARY KEY AUTO_INCREMENT, + j VARCHAR(255) ) ENGINE=InnoDB; # enable slow logging to table SET GLOBAL log_output = 'file,table'; SET GLOBAL slow_query_log = on; SET SESSION long_query_time = 0; -SET GLOBAL log_slow_admin_statements = on; +SET GLOBAL log_slow_admin_statements = off; # test ALTER, OPTIMIZE and CHECK against the table shown up ALTER TABLE log_slow_admin_statements ADD COLUMN k INT DEFAULT 17; @@ -40,17 +41,32 @@ DELIMITER ;$ CALL add_rows(); -# OPTIMIZE TABLE +ANALYZE TABLE log_slow_admin_statements; OPTIMIZE TABLE log_slow_admin_statements; - -# CHECK TABLE CHECK TABLE log_slow_admin_statements EXTENDED; -# DROP TABLE +--echo # Administrative sql statements must not be logged +SELECT count(sql_text)= 0 FROM mysql.slow_log + WHERE sql_text LIKE '%TABLE log_slow_admin_statements%'; +# SELECT sql_text FROM mysql.slow_log WHERE sql_text LIKE '%TABLE log_slow_admin_statements%'; + +SET GLOBAL log_slow_admin_statements = on; + DROP TABLE log_slow_admin_statements; +CREATE TABLE log_slow_admin_statements ( + i INT PRIMARY KEY AUTO_INCREMENT, + j VARCHAR(255) +) ENGINE=InnoDB; -# ALTER, OPTIMIZE, CHECK and DROP operations should be logged in slow query log. -SELECT sql_text FROM mysql.slow_log WHERE sql_text LIKE '%TABLE log_slow_admin_statements%'; +CALL add_rows(); + +ANALYZE TABLE log_slow_admin_statements; +OPTIMIZE TABLE log_slow_admin_statements; +CHECK TABLE log_slow_admin_statements EXTENDED; + +--echo # At least one administrative sql statement must be logged in slow query log +SELECT count(sql_text)> 0 FROM mysql.slow_log + WHERE sql_text LIKE '%TABLE log_slow_admin_statements%'; SET @@global.log_output= @old_log_output; SET @@global.slow_query_log= @old_slow_query_log; @@ -58,4 +74,5 @@ SET @@session.long_query_time= @old_long_query_time; SET @@global.log_slow_admin_statements= @old_log_slow_admin_statements; DROP PROCEDURE add_rows; +DROP TABLE log_slow_admin_statements; TRUNCATE TABLE mysql.slow_log; diff --git a/mysql-wsrep-5.6/mysql-test/t/fulltext.test b/mysql-wsrep-5.6/mysql-test/t/fulltext.test index 33f3b287..e756b5b4 100644 --- a/mysql-wsrep-5.6/mysql-test/t/fulltext.test +++ b/mysql-wsrep-5.6/mysql-test/t/fulltext.test @@ -646,3 +646,44 @@ SELECT 1 FROM q WHERE (SELECT MATCH(b) AGAINST ('*') FROM z); eval explain format=json $query; DROP TABLE z, q; + + +--echo # +--echo # BUG#21625016: INNODB FULL TEXT CASE SENSITIVE NOT WORKING +--echo # + +CREATE TABLE t1(fld1 VARCHAR(10) COLLATE 'latin1_bin', FULLTEXT INDEX (fld1)) +ENGINE=InnoDB; + +INSERT INTO t1 VALUES ('abCD'),('ABCD'); + +--echo # With the patch, case sensitive comparison is performed since +--echo # binary collation is used. +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN BOOLEAN MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN BOOLEAN MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN NATURAL LANGUAGE MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN NATURAL LANGUAGE MODE); + +--echo # Since binary collation is not used, case insensitive comparison is +--echo # performed. +ALTER TABLE t1 MODIFY fld1 VARCHAR(10) COLLATE 'latin1_general_cs'; +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN BOOLEAN MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN BOOLEAN MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN NATURAL LANGUAGE MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN NATURAL LANGUAGE MODE); + +--echo # With the patch, case sensitive comparison is performed. +ALTER TABLE t1 MODIFY fld1 VARCHAR(10) COLLATE 'utf8mb4_bin'; +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN BOOLEAN MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN BOOLEAN MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN NATURAL LANGUAGE MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN NATURAL LANGUAGE MODE); + +--echo # Test(using case insensitive collation) added for coverage +ALTER TABLE t1 MODIFY fld1 VARCHAR(10) COLLATE 'utf8mb4_general_ci'; +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN BOOLEAN MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN BOOLEAN MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('abCD' IN NATURAL LANGUAGE MODE); +SELECT * FROM t1 WHERE MATCH(fld1) AGAINST ('ABCD' IN NATURAL LANGUAGE MODE); + +DROP TABLE t1; diff --git a/mysql-wsrep-5.6/mysql-test/t/group_min_max_innodb.test b/mysql-wsrep-5.6/mysql-test/t/group_min_max_innodb.test index c41f2a6f..fdd045de 100644 --- a/mysql-wsrep-5.6/mysql-test/t/group_min_max_innodb.test +++ b/mysql-wsrep-5.6/mysql-test/t/group_min_max_innodb.test @@ -419,3 +419,29 @@ eval $query4; eval $query5; DROP TABLE t1; + +--echo # +--echo # Bug #25989915: LOOSE INDEX SCANS RETURNING WRONG RESULT +--echo # + +CREATE TABLE t1 ( + pk INT NOT NULL AUTO_INCREMENT, + c1 varchar(100) DEFAULT NULL, + c2 INT NOT NULL, + PRIMARY KEY (pk), + UNIQUE KEY ukey (c2,c1) +)ENGINE=INNODB; + +INSERT INTO t1(pk, c2) VALUES (100, 0), (101, 0), (102, 0), (103, 0); +ANALYZE TABLE t1; + +let query1= SELECT COUNT(DISTINCT(c2)) FROM t1 WHERE pk IN (102, 101); +let query2= SELECT COUNT(DISTINCT(c2)) FROM t1 WHERE pk IN (102, 100); + +eval EXPLAIN $query1; +eval EXPLAIN $query2; + +eval $query1; +eval $query2; + +DROP TABLE t1; diff --git a/mysql-wsrep-5.6/mysql-test/t/information_schema.test b/mysql-wsrep-5.6/mysql-test/t/information_schema.test index e70155b5..addefffd 100644 --- a/mysql-wsrep-5.6/mysql-test/t/information_schema.test +++ b/mysql-wsrep-5.6/mysql-test/t/information_schema.test @@ -1878,6 +1878,24 @@ DROP TABLE t1; --error ER_DBACCESS_DENIED_ERROR CREATE PROCEDURE information_schema.is() BEGIN END; + +--echo # +--echo # Bug#26877788 SELECT FROM INFORMATION_SCHEMA.FILES RETURNS NO RECORDS WHEN ORDER BY IS USED +--echo # + +SELECT ENGINE, SUPPORT, TRANSACTIONS FROM INFORMATION_SCHEMA.ENGINES +WHERE +SUPPORT IN ( +SELECT DISTINCT SUPPORT +FROM INFORMATION_SCHEMA.ENGINES +WHERE +ENGINE IN ( +SELECT DISTINCT ENGINE FROM INFORMATION_SCHEMA.ENGINES +WHERE ENGINE IN ('MEMORY'))) +ORDER BY ENGINE +LIMIT 1; + + --echo # --echo # End of 5.6 tests --echo # diff --git a/mysql-wsrep-5.6/mysql-test/t/partition_innodb.test b/mysql-wsrep-5.6/mysql-test/t/partition_innodb.test index 8c5f9adf..e11901be 100644 --- a/mysql-wsrep-5.6/mysql-test/t/partition_innodb.test +++ b/mysql-wsrep-5.6/mysql-test/t/partition_innodb.test @@ -939,3 +939,19 @@ DROP TABLE t1; --rmdir $MYSQL_TMP_DIR/temp_dir/test --rmdir $MYSQL_TMP_DIR/temp_dir + + +--echo +--echo Bug #26034430 ASSERTION `PART_REC_BUF_PTR' FAILED. +--echo +--echo + +CREATE TABLE t1 ( a INT NOT NULL, b INT NOT NULL, c INT NOT NULL, PRIMARY KEY(a,b)) PARTITION BY RANGE (a)(PARTITION x1 VALUES LESS THAN (1)); + +SELECT * FROM t1 WHERE (a = 1 and b = 1 and c = 'b') OR (a > 2) ORDER BY a DESC; + +CREATE TABLE t(id INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, dttm DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, msg TEXT,PRIMARY KEY (id,dttm))ENGINE=INNODB DEFAULT CHARSET=UTF8MB4 ROW_FORMAT=DYNAMIC PARTITION BY RANGE COLUMNS(dttm) (PARTITION pf_201612 VALUES LESS THAN ('20170101') ENGINE = INNODB); + +SELECT * FROM t WHERE dttm > '2017-01-19' ORDER BY id DESC; + +DROP TABLE t,t1; diff --git a/mysql-wsrep-5.6/mysys/my_getsystime.c b/mysql-wsrep-5.6/mysys/my_getsystime.c index 5e9ff149..5c52f41d 100644 --- a/mysql-wsrep-5.6/mysys/my_getsystime.c +++ b/mysql-wsrep-5.6/mysys/my_getsystime.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,42 @@ #include "mysys_priv.h" #include "my_static.h" +#if defined(_WIN32) +#include "my_sys.h" /* for my_printf_error */ +typedef VOID(WINAPI *time_fn)(LPFILETIME); +static time_fn my_get_system_time_as_file_time= GetSystemTimeAsFileTime; + +/** +Initialise highest available time resolution API on Windows +@return Initialization result +@retval FALSE Success +@retval TRUE Error. Couldn't initialize environment +*/ +my_bool win_init_get_system_time_as_file_time() +{ + DWORD error; + HMODULE h; + h= LoadLibrary("kernel32.dll"); + if (h != NULL) + { + time_fn pfn= (time_fn) GetProcAddress(h, "GetSystemTimePreciseAsFileTime"); + if (pfn) + my_get_system_time_as_file_time= pfn; + + return FALSE; + } + + error= GetLastError(); + my_printf_error(0, + "LoadLibrary(\"kernel32.dll\") failed: GetLastError returns %lu", + MYF(0), + error); + + return TRUE; +} +#endif + + /** Get high-resolution time. @@ -89,18 +125,16 @@ time_t my_time(myf flags) Return time in microseconds. @remark This function is to be used to measure performance in - micro seconds. As it's not defined whats the start time - for the clock, this function us only useful to measure - time between two moments. + micro seconds. - @retval Value in microseconds from some undefined point in time. + @retval Number of microseconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC) */ ulonglong my_micro_time() { #ifdef _WIN32 ulonglong newtime; - GetSystemTimeAsFileTime((FILETIME*)&newtime); + my_get_system_time_as_file_time((FILETIME*)&newtime); newtime-= OFFSET_TO_EPOCH; return (newtime/10); #else diff --git a/mysql-wsrep-5.6/mysys/my_init.c b/mysql-wsrep-5.6/mysys/my_init.c index 78ba7cf3..c9c3a6ca 100644 --- a/mysql-wsrep-5.6/mysys/my_init.c +++ b/mysql-wsrep-5.6/mysys/my_init.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,6 +30,7 @@ my_bool have_tcpip=0; static void my_win_init(void); static my_bool win32_init_tcp_ip(); +my_bool win_init_get_system_time_as_file_time(); #else #define my_win_init() #endif @@ -109,6 +110,8 @@ my_bool my_init(void) DBUG_PRINT("exit", ("home: '%s'", home_dir)); #ifdef __WIN__ win32_init_tcp_ip(); + if (win_init_get_system_time_as_file_time()) + DBUG_RETURN(1); #endif DBUG_RETURN(0); } diff --git a/mysql-wsrep-5.6/mysys_ssl/my_default.cc b/mysql-wsrep-5.6/mysys_ssl/my_default.cc index 262c6620..35467c15 100644 --- a/mysql-wsrep-5.6/mysys_ssl/my_default.cc +++ b/mysql-wsrep-5.6/mysys_ssl/my_default.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -273,7 +273,7 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, (char **) &my_login_path, found_no_defaults); if (! my_defaults_group_suffix) - my_defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV)); + my_defaults_group_suffix= getenv("MYSQL_GROUP_SUFFIX"); if (forced_extra_defaults && !defaults_already_read) { diff --git a/mysql-wsrep-5.6/packaging/WiX/custom_ui.wxs b/mysql-wsrep-5.6/packaging/WiX/custom_ui.wxs index 9475de92..a0dba4b6 100644 --- a/mysql-wsrep-5.6/packaging/WiX/custom_ui.wxs +++ b/mysql-wsrep-5.6/packaging/WiX/custom_ui.wxs @@ -30,7 +30,7 @@ - + diff --git a/mysql-wsrep-5.6/packaging/deb-in/CMakeLists.txt b/mysql-wsrep-5.6/packaging/deb-in/CMakeLists.txt index aa14eb42..c0ca360f 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/CMakeLists.txt +++ b/mysql-wsrep-5.6/packaging/deb-in/CMakeLists.txt @@ -196,27 +196,6 @@ ELSEIF(DEB_CODENAME STREQUAL "trusty") SET (DEB_SERVICE_SERVER_EXECPOST "") SET (DEB_INIT_APPARMOR "/lib/init/apparmor-profile-load usr.sbin.mysqld") SET (DEB_STARTUP "SYSV") -ELSEIF(DEB_CODENAME STREQUAL "wily") - SET (DEB_PLATFORMRELEASE "ubuntu15.10") - SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)") - SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/") - SET (DEB_RULES_INSTALL_SYSTEMD - "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/") - SET (DEB_RULES_INSTALL_APPARMOR - "install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld") - SET (DEB_RULES_APPARMOR_LOAD - "dh_apparmor -pmysql-community-server --profile-name=usr.sbin.mysqld") - SET (DEB_SYSTEMD_SERVICE_NAME "mysql") - SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --no-enable --name=mysql") - SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade") - SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start") - SET (DEB_INSTALL_SERVER_APPARMOR "etc/apparmor.d/usr.sbin.mysqld") - SET (DEB_SERVICE_SERVER_EXECPRE - "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre") - SET (DEB_SERVICE_SERVER_EXECPOST - "ExecStartPost=/usr/share/mysql/mysql-systemd-start post") - SET (DEB_INIT_APPARMOR "/lib/init/apparmor-profile-load usr.sbin.mysqld") - SET (DEB_STARTUP "SYSTEMD") ELSEIF(DEB_CODENAME STREQUAL "xenial") SET (DEB_PLATFORMRELEASE "ubuntu16.04") SET (DEB_CONTROL_BDEPS "dh-apparmor") @@ -235,8 +214,8 @@ ELSEIF(DEB_CODENAME STREQUAL "xenial") SET (DEB_SERVICE_SERVER_EXECPOST "") SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld") SET (DEB_STARTUP "SYSV") -ELSEIF(DEB_CODENAME STREQUAL "yakkety") - SET (DEB_PLATFORMRELEASE "ubuntu16.10") +ELSEIF(DEB_CODENAME STREQUAL "zesty") + SET (DEB_PLATFORMRELEASE "ubuntu17.04") SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)") SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/") SET (DEB_RULES_INSTALL_SYSTEMD @@ -255,9 +234,8 @@ ELSEIF(DEB_CODENAME STREQUAL "yakkety") SET (DEB_SERVICE_SERVER_EXECPOST "ExecStartPost=/usr/share/mysql/mysql-systemd-start post") SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld") - SET (DEB_STARTUP "SYSTEMD") -ELSEIF(DEB_CODENAME STREQUAL "zesty") - SET (DEB_PLATFORMRELEASE "ubuntu17.04") +ELSEIF(DEB_CODENAME STREQUAL "artful") + SET (DEB_PLATFORMRELEASE "ubuntu17.10") SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)") SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/") SET (DEB_RULES_INSTALL_SYSTEMD diff --git a/mysql-wsrep-5.6/packaging/deb-in/libmysqlclient-dev.install.in b/mysql-wsrep-5.6/packaging/deb-in/libmysqlclient-dev.install.in index 8c649cce..054d3321 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/libmysqlclient-dev.install.in +++ b/mysql-wsrep-5.6/packaging/deb-in/libmysqlclient-dev.install.in @@ -1,4 +1,4 @@ -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,5 +26,5 @@ usr/lib/*/libmysqlservices.a usr/share/aclocal/mysql.m4 usr/share/man/man1/mysql_config.1 # legal -usr/share/doc/libmysqlclient-dev/@DEB_INSTALL_LICENSEFILE@ -usr/share/doc/libmysqlclient-dev/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/libmysqlclient-dev/ +usr/share/mysql/README usr/share/doc/libmysqlclient-dev/ diff --git a/mysql-wsrep-5.6/packaging/deb-in/libmysqlclient18.install.in b/mysql-wsrep-5.6/packaging/deb-in/libmysqlclient18.install.in index 32f23c29..6160f7b4 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/libmysqlclient18.install.in +++ b/mysql-wsrep-5.6/packaging/deb-in/libmysqlclient18.install.in @@ -1,4 +1,4 @@ -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,5 +16,5 @@ usr/lib/*/libmysqlclient.so.18* usr/lib/*/libmysqlclient_r.so.18* # legal -usr/share/doc/libmysqlclient18/@DEB_INSTALL_LICENSEFILE@ -usr/share/doc/libmysqlclient18/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/libmysqlclient18/ +usr/share/mysql/README usr/share/doc/libmysqlclient18/ diff --git a/mysql-wsrep-5.6/packaging/deb-precise/libmysqld-dev.install b/mysql-wsrep-5.6/packaging/deb-in/libmysqld-dev.install.in similarity index 77% rename from mysql-wsrep-5.6/packaging/deb-precise/libmysqld-dev.install rename to mysql-wsrep-5.6/packaging/deb-in/libmysqld-dev.install.in index f2b59fcb..9728ec13 100644 --- a/mysql-wsrep-5.6/packaging/deb-precise/libmysqld-dev.install +++ b/mysql-wsrep-5.6/packaging/deb-in/libmysqld-dev.install.in @@ -1,4 +1,4 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,5 +16,5 @@ usr/lib/*/libmysqld.a usr/lib/*/libmysqld-debug.a # legal -usr/share/doc/libmysqld-dev/COPYING -usr/share/doc/libmysqld-dev/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/libmysqld-dev/ +usr/share/mysql/README usr/share/doc/libmysqld-dev/ diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-bench.install b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-bench.install.in similarity index 74% rename from mysql-wsrep-5.6/packaging/deb-precise/mysql-community-bench.install rename to mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-bench.install.in index 8aa8be6f..b406b07a 100644 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-bench.install +++ b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-bench.install.in @@ -1,4 +1,4 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,5 +15,5 @@ usr/lib/mysql/sql-bench/* # legal -usr/share/doc/mysql-community-bench/COPYING -usr/share/doc/mysql-community-bench/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-bench/ +usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-bench/ diff --git a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-client-SERIES.install.in b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-client-SERIES.install.in index 7572d2b6..1d547ab3 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-client-SERIES.install.in +++ b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-client-SERIES.install.in @@ -16,6 +16,5 @@ usr/bin/mysqldumpslow usr/bin/mysqlimport usr/bin/mysqlshow usr/bin/mysqlslap -usr/share/doc/mysql-@DEB_PRODUCTNAME@-client@DEB_PRODUCTSERIES@/ -usr/share/doc/mysql-@DEB_PRODUCTNAME@-client@DEB_PRODUCTSERIES@/@DEB_INSTALL_LICENSEFILE@ -usr/share/doc/mysql-@DEB_PRODUCTNAME@-client@DEB_PRODUCTSERIES@/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-client@DEB_PRODUCTSERIES@/ +usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client@DEB_PRODUCTSERIES@/ diff --git a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-client.install.in b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-client.install.in index 6c9066c7..7cb17271 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-client.install.in +++ b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-client.install.in @@ -55,5 +55,5 @@ usr/share/man/man1/mysqlman.1 usr/share/man/man1/mysqlshow.1 usr/share/man/man1/mysqlslap.1 # legal -usr/share/doc/mysql-@DEB_PRODUCTNAME@-client/@DEB_INSTALL_LICENSEFILE@ -usr/share/doc/mysql-@DEB_PRODUCTNAME@-client/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-client/ +usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client/ diff --git a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-common-SERIES.install.in b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-common-SERIES.install.in index c5a54d68..e31578e7 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-common-SERIES.install.in +++ b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-common-SERIES.install.in @@ -1,4 +1,4 @@ -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,5 +25,5 @@ usr/share/mysql/docs/INFO_BIN usr/share/mysql/charsets/*.xml usr/share/mysql/charsets/README # legal -usr/share/doc/mysql-@DEB_PRODUCTNAME@-common@DEB_PRODUCTSERIES@/@DEB_INSTALL_LICENSEFILE@ -usr/share/doc/mysql-@DEB_PRODUCTNAME@-common@DEB_PRODUCTSERIES@/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-common/ +usr/share/mysql/README usr/share/doc/mysql-common/ diff --git a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-server-SERIES.install.in b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-server-SERIES.install.in index 75a63c82..f7151951 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-server-SERIES.install.in +++ b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-server-SERIES.install.in @@ -69,7 +69,7 @@ usr/share/man/man1/myisamchk.1 usr/share/man/man1/myisamlog.1 usr/share/man/man1/myisampack.1 usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysql-stress-test.pl.1 +usr/share/man/man1/mysql_convert_table_format.1 usr/share/man/man1/mysql_install_db.1 usr/share/man/man1/mysql_plugin.1 usr/share/man/man1/mysql_secure_installation.1 @@ -114,7 +114,5 @@ usr/share/mysql/*/errmsg.sys usr/share/mysql/errmsg-utf8.txt @DEB_INSTALL_SERVER_SYSTEMD@ # legal -usr/share/doc/mysql-@DEB_PRODUCTNAME@-server@DEB_PRODUCTSERIES@/ -usr/share/doc/mysql-@DEB_PRODUCTNAME@-server@DEB_PRODUCTSERIES@/@DEB_INSTALL_LICENSEFILE@ -usr/share/doc/mysql-@DEB_PRODUCTNAME@-server@DEB_PRODUCTSERIES@/README -usr/share/doc/mysql-@DEB_PRODUCTNAME@-server@DEB_PRODUCTSERIES@/@DEB_WSREP_README@ +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-server/ +usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-server/ diff --git a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-source-SERIES.install.in b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-source-SERIES.install.in index 3469197e..3556b870 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-source-SERIES.install.in +++ b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-source-SERIES.install.in @@ -1,4 +1,4 @@ -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,5 +17,5 @@ ../*.tar.gz usr/src/mysql/ @DEB_INSTALL_SOURCE_XZ@ # legal -usr/share/doc/mysql-@DEB_PRODUCTNAME@-source@DEB_PRODUCTSERIES@/@DEB_INSTALL_LICENSEFILE@ -usr/share/doc/mysql-@DEB_PRODUCTNAME@-source@DEB_PRODUCTSERIES@/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-source/ +usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-source/ diff --git a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-test-SERIES.install.in b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-test-SERIES.install.in index 54081237..6a6d62cb 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-test-SERIES.install.in +++ b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-test-SERIES.install.in @@ -65,5 +65,5 @@ usr/lib/mysql/plugin/test_udf_services.so # test suite usr/lib/mysql-test/* # legal -usr/share/doc/mysql-@DEB_PRODUCTNAME@-test@DEB_PRODUCTSERIES@/@DEB_INSTALL_LICENSEFILE@ -usr/share/doc/mysql-@DEB_PRODUCTNAME@-test@DEB_PRODUCTSERIES@/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-test@DEB_PRODUCTSERIES@/ +usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-test@DEB_PRODUCTSERIES@/README diff --git a/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-test.install.in b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-test.install.in new file mode 100644 index 00000000..092dd06d --- /dev/null +++ b/mysql-wsrep-5.6/packaging/deb-in/mysql-packagesource-test.install.in @@ -0,0 +1,35 @@ +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +# binaries +usr/bin/mysql_client_test +usr/bin/mysql_client_test_embedded +usr/bin/mysqltest +usr/bin/mysqltest_embedded +# plugins +usr/lib/mysql/plugin/auth.so +usr/lib/mysql/plugin/auth_test_plugin.so +usr/lib/mysql/plugin/daemon_example.ini +usr/lib/mysql/plugin/libdaemon_example.so +usr/lib/mysql/plugin/qa_auth_client.so +usr/lib/mysql/plugin/qa_auth_interface.so +usr/lib/mysql/plugin/qa_auth_server.so +usr/lib/mysql/plugin/test_udf_services.so +@DEB_INSTALL_DEBUG_TEST_PLUGINS@ +# test suite +usr/lib/mysql-test/* +# legal +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-test/ +usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-test/ diff --git a/mysql-wsrep-5.6/packaging/deb-in/mysql-server.install.in b/mysql-wsrep-5.6/packaging/deb-in/mysql-server.install.in index bcb11b4f..91416cc9 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/mysql-server.install.in +++ b/mysql-wsrep-5.6/packaging/deb-in/mysql-server.install.in @@ -1,4 +1,4 @@ -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,5 +14,5 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # legal -usr/share/doc/mysql-server/@DEB_INSTALL_LICENSEFILE@ -usr/share/doc/mysql-server/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-server/ +usr/share/mysql/README usr/share/doc/mysql-server/ diff --git a/mysql-wsrep-5.6/packaging/deb-in/mysql-testsuite.install.in b/mysql-wsrep-5.6/packaging/deb-in/mysql-testsuite.install.in index 644be2c6..80d450e3 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/mysql-testsuite.install.in +++ b/mysql-wsrep-5.6/packaging/deb-in/mysql-testsuite.install.in @@ -1,4 +1,4 @@ -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,5 +14,5 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # legal -usr/share/doc/mysql-testsuite/@DEB_INSTALL_LICENSEFILE@ -usr/share/doc/mysql-testsuite/README +usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-testsuite/ +usr/share/mysql/README usr/share/doc/mysql-testsuite/ diff --git a/mysql-wsrep-5.6/packaging/deb-in/rules.in b/mysql-wsrep-5.6/packaging/deb-in/rules.in index 09dffea0..fed6dfe6 100644 --- a/mysql-wsrep-5.6/packaging/deb-in/rules.in +++ b/mysql-wsrep-5.6/packaging/deb-in/rules.in @@ -103,47 +103,7 @@ override_dh_auto_install: # add apparmor profile @DEB_RULES_INSTALL_APPARMOR@ # add systemd script - #@DEB_RULES_INSTALL_SYSTEMD@ - # add directory for legal docs - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-server@DEB_PRODUCTSERIES@ - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-client@DEB_PRODUCTSERIES@ - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-common@DEB_PRODUCTSERIES@ - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18 - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev - # install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-test@DEB_PRODUCTSERIES@ - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-source@DEB_PRODUCTSERIES@ - @DEB_NDB_RULES_DOCDIRS@ - # add @DEB_INSTALL_LICENSEFILE@ file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/mysql-server/@DEB_INSTALL_LICENSEFILE@ - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-server@DEB_PRODUCTSERIES@/@DEB_INSTALL_LICENSEFILE@ - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/mysql-client/@DEB_INSTALL_LICENSEFILE@ - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-client@DEB_PRODUCTSERIES@/@DEB_INSTALL_LICENSEFILE@ - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-common@DEB_PRODUCTSERIES@/@DEB_INSTALL_LICENSEFILE@ - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/libmysqlclient18/@DEB_INSTALL_LICENSEFILE@ - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/libmysqlclient-dev/@DEB_INSTALL_LICENSEFILE@ - # install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/libmysqld-dev/@DEB_INSTALL_LICENSEFILE@ - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/mysql-testsuite/@DEB_INSTALL_LICENSEFILE@ - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-test@DEB_PRODUCTSERIES@/@DEB_INSTALL_LICENSEFILE@ - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-source@DEB_PRODUCTSERIES@/@DEB_INSTALL_LICENSEFILE@ - @DEB_NDB_RULES_LICENSE@ - # add README file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-server@DEB_PRODUCTSERIES@/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README-wsrep debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-server@DEB_PRODUCTSERIES@ - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-client@DEB_PRODUCTSERIES@/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-common@DEB_PRODUCTSERIES@/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README - # install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-test@DEB_PRODUCTSERIES@/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-@DEB_PRODUCTNAME@-source@DEB_PRODUCTSERIES@/README - @DEB_NDB_RULES_README@ + @DEB_RULES_INSTALL_SYSTEMD@ touch $@ @@ -170,12 +130,12 @@ override_dh_install: dh_install --list-missing \ -Xusr/bin/i_mysql_client_test \ -Xusr/share/mysql/mysql.server \ - -Xusr/share/mysql/@DEB_INSTALL_LICENSEFILE@ \ - -Xusr/share/mysql/README \ + -Xusr/share/man/man1/mysql.server.1 \ + -Xusr/share/mysql/binary-configure \ -Xusr/share/mysql/docs/mysql.info \ - -Xusr/share/mysql/docs/INSTALL-BINARY \ - -Xusr/share/man/man1/mysqlman.1 -ifneq (,@DEB_RULES_APPARMOR_LOAD@) - # non-empty command = apparmor is handled - dh_apparmor -pmysql-server@DEB_PRODUCTSERIES@ --profile-name=usr.sbin.mysqld -endif + -Xusr/share/man/man1/mysqlman.1 \ + -Xusr/share/man/man1/mysqltest \ + -Xusr/share/man/man1/mysql_client_test \ + -Xusr/share/man/man1/mysql-stress-test.pl.1 \ + -Xusr/share/man/man1/mysql-test-run.pl.1 \ + -X.h.pp diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/changelog b/mysql-wsrep-5.6/packaging/deb-jessie/changelog deleted file mode 100644 index 6c788508..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/changelog +++ /dev/null @@ -1,95 +0,0 @@ -mysql-community (5.6.26-1debian8) jessie; urgency=low - - * new upstream release - * mysql-commercial-server now depends on perl, psmisc - mysql-commercial-test now depends on python, libmysqlclient-dev - (Closes: #20893836) - - -- Akhil Mohan Thu, 18 Jun 2015 16:34:10 +0530 - -mysql-community (5.6.25-2debian8) jessie; urgency=low - - * new upstream release - * added systemd support - - -- Akhil Mohan Fri, 29 May 2015 17:07:34 +0530 - -mysql-community (5.6.24-2debian8) jessie; urgency=low - - * new upstream release - - -- Akhil Mohan Mon, 14 Apr 2015 16:40:14 +0530 - -mysql-community (5.6.24-1debian7) wheezy; urgency=low - - * new upstream release - - -- Akhil Mohan Mon, 16 Feb 2015 15:45:09 +0530 - -mysql-community (5.6.23-1debian7) wheezy; urgency=low - - * new upstream release - * mysql-community-server now recommends mysql-client - * removed template install-test-db; not installed by default - * d/compat incremented to 9 from 8 - * d/control updated to build depend on debhelper 9 - * added d/*.lintian-overrides and d/source/lintian-overrides - * d/rules updated to reflect correct file permissions - - -- Akhil Mohan Wed, 31 Dec 2014 10:51:07 +0530 - -mysql-community (5.6.22-1debian7) wheezy; urgency=low - - * new upstream release - * fixed d/*server.postinst to allow dropping test db without - setting root password - * init script will now run my_i_db if data dir is not present or empty - - -- Akhil Mohan Wed, 24 Sep 2014 14:48:07 +0530 - -mysql-community (5.6.21-1debian7) wheezy; urgency=low - - * new upstream release - * updated d/rules to increment -j8 as make option - * updated d/source/include-binaries to add mysql_no_login plugin - * updated CMake option WITH_EXTRA_CHARSETS from complex to all - - -- Akhil Mohan Wed, 20 Aug 2014 19:12:30 +0530 - -mysql-community (5.6.20-1debian7) wheezy; urgency=low - - * new upstream release - * added fakeroot as build-dep in d/control - * added d/*.dirs for bench, dev and test pkg - * updated d/rules to make compilation verbose - * removed default CFLAGS, CXXFLAGS in d/rules - * added patch for testsuite search paths under d/patches - * modified cmake option for testsuite in d/rules - * updated patch d/fix-mysql_install_db.patch - * enabled two patches in d/patches/series - * removed extra permissions check in d/rules when fixed in source - * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf - * modified d/*-test.* for updated location of testsuite - * updated d/{mysql-*-server.install,rules} to include debug plugins - * updated d/rules to remove storage engine cmake options - * modified data dir permission in d/*server.{pre,post}inst - * updated d/source/include-binaries to add debug plugins - * updated d/rules to rename debug plugins - - -- Akhil Mohan Wed, 02 Jul 2014 17:45:30 +0530 - -mysql-community (5.6.19-1debian7) wheezy; urgency=low - - * new upstream release - * d/rules updated to rid of files removed from source - * modified path for source tar in source pkg - * obscured actual filenames in d/source/include-binaries - * modified d/rules to handle obscured filenames - - -- Akhil Mohan Mon, 05 May 2014 15:45:10 +0530 - -mysql-community (5.6.17-1debian7) stable; urgency=low - - * new upstream release - - -- Akhil Mohan Fri, 28 Feb 2014 18:06:30 +0530 diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/compat b/mysql-wsrep-5.6/packaging/deb-jessie/compat deleted file mode 100644 index ec635144..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/control b/mysql-wsrep-5.6/packaging/deb-jessie/control deleted file mode 100644 index 7ce536d4..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/control +++ /dev/null @@ -1,188 +0,0 @@ -Source: mysql-community -Maintainer: MySQL Release Engineering -Section: database -Priority: optional -Standards-Version: 3.9.5 -Homepage: http://www.mysql.com/ -Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-systemd (>= 1.5), lsb-release, cmake, fakeroot, libnuma-dev - -Package: mysql-server -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends} -Description: MySQL Server meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql server - package available in the repository. - -Package: mysql-community-server -Architecture: any -Pre-depends: debconf (>= 0.2.17), adduser -Depends: mysql-common (= ${binary:Version}), perl, psmisc, - ${shlibs:Depends}, ${misc:Depends} -Recommends: mysql-client (= ${binary:Version}) -Conflicts: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Replaces: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Provides: virtual-mysql-server, virtual-mysql-server-core, - mysql-server-5.6, mysql-server-core-5.6 -Description: MySQL Server - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package includes the MySQL server binary as well as related - utilities to run and administer a MySQL server. - -Package: mysql-client -Architecture: any -Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends} -Description: MySQL Client meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql client - package available in the repository. - -Package: mysql-community-client -Architecture: any -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Replaces: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Provides: virtual-mysql-client, virtual-mysql-client-core, - mysql-client-5.6, mysql-client-core-5.6 -Description: MySQL Client - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the standard MySQL clients and - administration tools. - -Package: libmysqlclient18 -Architecture: any -Section: libs -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL shared client libraries - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the shared libraries for MySQL client - applications. - -Package: mysql-common -Architecture: any -Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends} -Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql -Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev -Provides: mysql-common -Description: MySQL Common - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains common files needed by MySQL client - library, MySQL database server, and MySQL embedded server. - -Package: libmysqlclient-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient18 (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL development headers - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the development header files necessary - to develop MySQL client applications. - -Package: libmysqld-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient-dev (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL embedded server library - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL server as an embedded library. - -Package: mysql-testsuite -Architecture: any -Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends} -Description: MySQL Testsuite meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql test - package available in the repository. - -Package: mysql-community-test -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - mysql-community-client (= ${binary:Version}), python, - libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5, - mysql-testsuite-5.6, mysql-commercial-test -Description: MySQL Test Run MTR - The MySQL testsuite - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL regression test suite for MySQL - database server. - -Package: mysql-community-bench -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-commercial-bench -Description: MySQL Bench - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. - -Package: mysql-community-source -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: MySQL source - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/copyright b/mysql-wsrep-5.6/packaging/deb-jessie/copyright deleted file mode 100644 index 482a6765..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/copyright +++ /dev/null @@ -1,41 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: MySQL Server 5.6 -Upstream-Contact: MySQL Release Engineering -Source: http://dev.mysql.com/ - -Copyright: 2000, 2014, Oracle and/or its affiliates. All rights reserved. -License: - This is a release of MySQL, a dual-license SQL database server. - For the avoidance of doubt, this particular copy of the software - is released under the version 2 of the GNU General Public License. - MySQL is brought to you by Oracle. - . - MySQL FOSS License Exception - We want free and open source software applications under certain - licenses to be able to use specified GPL-licensed MySQL client - libraries despite the fact that not all such FOSS licenses are - compatible with version 2 of the GNU General Public License. - Therefore there are special exceptions to the terms and conditions - of the GPLv2 as applied to these client libraries, which are - identified and described in more detail in the FOSS License - Exception at - . - . - This distribution may include materials developed by third - parties. For license and attribution notices for these - materials, please refer to the documentation that accompanies - this distribution (see the "Licenses for Third-Party Components" - appendix) or view the online documentation at - . - . - GPLv2 Disclaimer - For the avoidance of doubt, except that if any license choice - other than GPL or LGPL is available it will apply instead, - Oracle elects to use only the General Public License version 2 - (GPLv2) at this time for any software where a choice of GPL - license versions is made available with the language indicating - that GPLv2 or any later version may be used, or where a choice - . - The full text of the GNU General Public License version 2 can - be found in the file - `/usr/share/mysql/doc/COPYING'. diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/extra/my.cnf b/mysql-wsrep-5.6/packaging/deb-jessie/extra/my.cnf deleted file mode 100644 index 3a5445fa..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/extra/my.cnf +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Community Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[client] -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[mysqld_safe] -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -explicit_defaults_for_timestamp - -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 - -log-error = /var/log/mysql/error.log - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/extra/mysql-systemd-start b/mysql-wsrep-5.6/packaging/deb-jessie/extra/mysql-systemd-start deleted file mode 100644 index 143d1753..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/extra/mysql-systemd-start +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Scripts to run by MySQL systemd service -# -# Needed argument: pre | post -# -# pre mode : try to perform sanity check for configuration, log, data -# post mode : ping server until answer is received - -pinger () { - while /bin/true ; do - sleep 1 - mysqladmin ping >/dev/null 2>&1 && break - done -} - -sanity () { - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - if [ ! -r /etc/mysql/my.cnf ]; then - echo "MySQL configuration not found at /etc/mysql/my.cnf. Please install one using update-alternatives." - exit 1 - fi -} - -case $1 in - "pre") sanity ;; - "post") pinger ;; -esac diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/extra/mysql_embedded.1 b/mysql-wsrep-5.6/packaging/deb-jessie/extra/mysql_embedded.1 deleted file mode 100644 index 735c4e05..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/extra/mysql_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysql.1 diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient-dev.dirs b/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient-dev.dirs deleted file mode 100644 index c287614c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient-dev.dirs +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql -usr/include/mysql/mysql diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient-dev.install b/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient-dev.install deleted file mode 100644 index e7e98c15..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient-dev.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql/*.h -usr/include/mysql/mysql/*.h -usr/include/mysql/mysql/*.h.pp -usr/include/mysql/mysql/psi/*.h -usr/lib/*/libmysqlclient.a -usr/lib/*/libmysqlclient.so -usr/lib/*/libmysqlservices.a -usr/bin/mysql_config -usr/bin/mysql_config_editor -usr/share/man/man1/mysql_config.1 -usr/share/man/man1/mysql_config_editor.1 -# legal -usr/share/doc/libmysqlclient-dev/COPYING -usr/share/doc/libmysqlclient-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient-dev.lintian-overrides deleted file mode 100644 index 09960eb2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient-dev.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz -libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient-dev: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient18.install b/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient18.install deleted file mode 100644 index fe6aa56c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient18.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqlclient.so.* -# legal -usr/share/doc/libmysqlclient18/COPYING -usr/share/doc/libmysqlclient18/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient18.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient18.lintian-overrides deleted file mode 100644 index 1f26511a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqlclient18.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz -libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient18: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqld-dev.install b/mysql-wsrep-5.6/packaging/deb-jessie/libmysqld-dev.install deleted file mode 100644 index 923f826a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqld-dev.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqld.a -usr/lib/*/libmysqld-debug.a -# legal -usr/share/doc/libmysqld-dev/COPYING -usr/share/doc/libmysqld-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqld-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/libmysqld-dev.lintian-overrides deleted file mode 100644 index 35caaeca..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/libmysqld-dev.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz -libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-client.install b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-client.install deleted file mode 100644 index 13b877e7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-client.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-client/COPYING -usr/share/doc/mysql-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-client.lintian-overrides deleted file mode 100644 index 5c4891c9..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-client.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql -mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz -mysql-client: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-common.dirs b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-common.dirs deleted file mode 100644 index 69265ef0..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-common.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-common.install b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-common.install deleted file mode 100644 index 8a22acd4..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-common.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/my.cnf -usr/share/aclocal/mysql.m4 -usr/share/mysql/docs/INFO_SRC -usr/share/mysql/docs/INFO_BIN -usr/share/mysql/docs/ChangeLog -# localized error msgs -usr/share/mysql/*/errmsg.sys -usr/share/mysql/errmsg-utf8.txt -# charsets -usr/share/mysql/charsets/*.xml -usr/share/mysql/charsets/README -# legal -usr/share/doc/mysql-common/COPYING -usr/share/doc/mysql-common/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-common.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-common.lintian-overrides deleted file mode 100644 index 70ddcdf6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-common.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql -mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz -mysql-common: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-bench.dirs b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-bench.dirs deleted file mode 100644 index d630d6b1..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-bench.dirs +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql -usr/lib/mysql/sql-bench diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-bench.install b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-bench.install deleted file mode 100644 index 065124bd..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-bench.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql/sql-bench/* -# legal -usr/share/doc/mysql-community-bench/COPYING -usr/share/doc/mysql-community-bench/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-bench.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-bench.lintian-overrides deleted file mode 100644 index 04df14ea..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-bench.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz -mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-client.install b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-client.install deleted file mode 100644 index 46cd07d4..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-client.install +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/innochecksum -usr/bin/myisam_ftdump -usr/bin/mysql -usr/bin/mysql_embedded -usr/bin/mysqlaccess -usr/bin/mysqlaccess.conf -usr/bin/mysqladmin -usr/bin/mysqlbug -usr/bin/mysqlcheck -usr/bin/mysql_client_test -usr/bin/mysql_client_test_embedded -usr/bin/mysqldump -usr/bin/mysqldumpslow -usr/bin/mysql_find_rows -usr/bin/mysql_fix_extensions -usr/bin/mysqlimport -usr/bin/mysql_plugin -usr/bin/mysqlshow -usr/bin/mysqlslap -usr/bin/mysql_waitpid -# man pages -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/myisam_ftdump.1 -usr/share/man/man1/mysql.1 -usr/share/man/man1/mysql_embedded.1 -usr/share/man/man1/mysqlaccess.1 -usr/share/man/man1/mysqladmin.1 -usr/share/man/man1/mysqlbug.1 -usr/share/man/man1/mysqlcheck.1 -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqldump.1 -usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 -usr/share/man/man1/mysqlimport.1 -usr/share/man/man1/mysqlman.1 -usr/share/man/man1/mysql_plugin.1 -usr/share/man/man1/mysqlshow.1 -usr/share/man/man1/mysqlslap.1 -usr/share/man/man1/mysql_waitpid.1 -# legal -usr/share/doc/mysql-community-client/COPYING -usr/share/doc/mysql-community-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-client.lintian-overrides deleted file mode 100644 index 58929356..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-client.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql -mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz -mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-client: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.config b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.config deleted file mode 100755 index cb6c39cf..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.config +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -if [ "$1" = "configure" ] && [ -z "$2" ]; -then - - set -e - - PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server - INSTALLED_PKG=none - MYSQLDATA=/var/lib/mysql - - IFS_BACKUP=${IFS} - IFS=":" - for PKG in ${PKG_LIST}; - do - STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4) - if [ "${STATUS}" = "installed" ]; - then - INSTALLED_PKG=${PKG} - break - fi - done - IFS=${IFS_BACKUP} - - if [ "${INSTALLED_PKG}" = "none" ]; - then - if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ]; - then - db_input high mysql-community-server/data-dir || true - else - db_fset mysql-community-server/data-dir seen true - fi - - while :; do - PASSWD="" - db_input high mysql-community-server/root-pass || true - db_go - - db_get mysql-community-server/root-pass - if [ -z "${RET}" ]; - then - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - break - fi - PASSWD="${RET}" - - db_input high mysql-community-server/re-root-pass || true - db_go - - db_get mysql-community-server/re-root-pass - if [ "${RET}" == "${PASSWD}" ]; - then - PASSWD="" - break - fi - - db_fset mysql-community-server/root-pass-mismatch seen false - db_input critical mysql-community-server/root-pass-mismatch - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - done - - else - db_fset mysql-community-server/data-dir seen true - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - fi - - set +e -fi diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.dirs b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.dirs deleted file mode 100644 index 91e71855..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.dirs +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d -etc/init.d -usr/lib/mysql -usr/lib/mysql/plugin diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.install b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.install deleted file mode 100644 index 03de8434..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.install +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/msql2mysql -usr/bin/myisamchk -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/my_print_defaults -usr/bin/mysqlbinlog -usr/bin/mysql_convert_table_format -usr/bin/mysqld_multi -usr/bin/mysqld_safe -usr/bin/mysqlhotcopy -usr/bin/mysql_install_db -usr/bin/mysql_secure_installation -usr/bin/mysql_setpermission -usr/bin/mysqltest -usr/bin/mysqltest_embedded -usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_zap -usr/bin/perror -usr/bin/replace -usr/bin/resolveip -usr/bin/resolve_stack_dump -usr/sbin/mysqld -# debug binary -usr/sbin/mysqld-debug -# man pages -usr/share/man/man1/comp_err.1 -usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 -usr/share/man/man1/myisamlog.1 -usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql.server.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql-stress-test.pl.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man1/mysql_zap.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 -usr/share/man/man1/resolve_stack_dump.1 -usr/share/man/man8/mysqld.8 -# SQL files -usr/share/mysql/*.sql -# plugins -usr/lib/mysql/plugin/*.so -usr/lib/mysql/plugin/debug/*.so -usr/lib/mysql/plugin/daemon_example.ini -usr/lib/mysql/plugin/debug/daemon_example.ini -# support files -usr/share/mysql/mysqld_multi.server -usr/share/mysql/magic -usr/share/mysql/mysql-log-rotate -usr/share/mysql/mysql-systemd-start -usr/share/mysql/my-default.cnf -usr/share/mysql/dictionary.txt -# legal -usr/share/doc/mysql-community-server/COPYING -usr/share/doc/mysql-community-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.lintian-overrides deleted file mode 100644 index 08b38654..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.lintian-overrides +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz -mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-server: embedded-library -# Since we ship debug plugins so this error is overridden -mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/* diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.mysql.init b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.mysql.init deleted file mode 100755 index d8c08082..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.mysql.init +++ /dev/null @@ -1,190 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $time -# Should-Stop: $network $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/ Stop MySQL Community Server daemon -# Description: This service script facilitates startup and shutdown of -# mysqld daemon throught its wrapper script mysqld_safe -### END INIT INFO -# - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /lib/lsb/init-functions - -cd / -umask 077 - -MYSQLDATA=/var/lib/mysql -VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4) - -get_mysql_option() { - RESULT=$(my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1) - if [ -z "$RESULT" ]; - then - RESULT="$3" - fi - echo $RESULT -} - -get_running () { - PIDFILE=$(get_mysql_option mysqld_safe pid-file "") - if [ -z "$PIDFILE" ]; - then - PIDFILE=$(get_mysql_option mysqld pid-file "$MYSQLDATA/$(hostname).pid") - fi - if [ -e "$PIDFILE" ] && [ -d "/proc/$(cat "$PIDFILE")" ]; - then - echo 1 - else - echo 0 - fi -} - -server_stop () { - RUNNING=$(get_running) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${RUNNING}" -eq 0 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - RUNNING=$(get_running) - sleep 1 - done - return 0 -} - -case "$1" in - 'start') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "A MySQL Server is already started" - else - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &" - for i in 1 2 3 4 5 6; - do - sleep 1 - echo -n . - done - echo - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is started" - else - log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details." - fi - fi - ;; - - 'stop') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - killall -15 mysqld - server_stop - if [ "$?" -eq 0 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is stopped" - else - log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out" - fi - else - log_action_msg "MySQL Community Server ${VERSION} is already stopped" - fi - ;; - - 'restart'|'reload'|'force-reload') - log_action_msg "Stopping MySQL Community Server ${VERSION}" - $0 stop - log_action_msg "Re-starting MySQL Community Server ${VERSION}" - $0 start - ;; - - 'status') - RUNNING=$(get_running) - if [ ${RUNNING} -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is running" - else - log_action_msg "MySQL Community Server ${VERSION} is not running" - exit 3 - fi - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.mysql.service b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.mysql.service deleted file mode 100644 index b3e33058..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.mysql.service +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# MySQL systemd service file - -[Unit] -Description=MySQL Community Server -After=network.target - -[Install] -WantedBy=multi-user.target - -[Service] -User=mysql -Group=mysql -PermissionsStartOnly=true -ExecStartPre=/usr/share/mysql/mysql-systemd-start pre -ExecStart=/usr/bin/mysqld_safe -ExecStartPost=/usr/share/mysql/mysql-systemd-start post -TimeoutSec=600 -Restart=on-failure diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.postinst b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.postinst deleted file mode 100755 index 0fe3dc12..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.postinst +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -take_upstart_job_backup () { - if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ]; - then - mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup - fi -} - -case "$1" in - configure) - -# MySQL 5.6.34 needs this - MYSQLFILES=/var/lib/mysql-files - if [ ! -d ${MYSQLFILES} -a ! -L ${MYSQLFILES} ]; - then - mkdir ${MYSQLFILES} - chown mysql:mysql ${MYSQLFILES} - chmod 770 ${MYSQLFILES} - fi - - if [ -z "$2" ]; - then - set -e - - MYSQLDATA=/var/lib/mysql - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - fi - - db_get mysql-community-server/root-pass && PASSWD=${RET} - if [ ! -z "${PASSWD}" ]; - then - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';" - else - PASSWD="" - fi - - SQL=`mktemp` - if [ -f "${SQL}" ]; - then - chmod 700 ${SQL} - cat << EOF > ${SQL} -USE mysql; -${PASSWD} -DELETE FROM user WHERE user=''; -FLUSH PRIVILEGES; -EOF - mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL - PASSWD="" - rm -f ${SQL} - fi - - set +e - - fi - - ;; - - abort-upgrade|abort-remove|abort-configure) - - ;; - - *) - exit 1 - ;; -esac - -db_stop - -take_upstart_job_backup - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.postrm b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.postrm deleted file mode 100755 index 55f83a3b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.postrm +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; -then -. /usr/share/debconf/confmodule -fi - -place_upstart_job_back () { - if [ -e "/var/lib/mysql/.mysql.conf.backup" ]; - then - mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf - fi -} - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - remove) - - set -e - - place_upstart_job_back - - set +e - - ;; - - purge) - - set -e - - place_upstart_job_back - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - MYSQLFILES=/var/lib/mysql-files - - server_stop - - db_input high mysql-community-server/remove-data-dir || true - db_go - db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET} - if [ "${RMDATADIR}" = "true" ]; - then - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if [ -d ${MYSQLFILES} ] || [ -L ${MYSQLFILES} ]; - then - rm -rf ${MYSQLFILES} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - abort-install) - - set -e - - place_upstart_job_back - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql start || exit $? - else - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if [ -d ${MYSQLFILES} ] || [ -L ${MYSQLFILES} ]; - then - rm -rf ${MYSQLFILES} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - upgrade|abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.preinst b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.preinst deleted file mode 100755 index e5b3b771..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.preinst +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - install) - - if [ -z "$2" ]; - then - - set -e - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql stop || exit $? - server_stop - fi - - MYSQLDATA=/var/lib/mysql - MYSQLFILES=/var/lib/mysql-files - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - if ! getent group mysql >/dev/null; - then - addgroup --system mysql >/dev/null - fi - - if ! getent passwd mysql >/dev/null; - then - adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null - fi - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d ${MYSQLFILES} -a ! -L ${MYSQLFILES} ]; - then - mkdir ${MYSQLFILES} - chown mysql:mysql ${MYSQLFILES} - chmod 770 ${MYSQLFILES} - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - set +e - - fi - - ;; - - upgrade) - - set -e - - #DEBHELPER# - server_stop - - set +e - - ;; - - abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.prerm b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.prerm deleted file mode 100755 index 7509de7a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.prerm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -#DEBHELPER# - -set +e - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.templates b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.templates deleted file mode 100644 index 2469d917..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-server.templates +++ /dev/null @@ -1,34 +0,0 @@ -Template: mysql-community-server/root-pass -Type: password -Description: Enter root password: - Please provide a strong password that will be set for the root account of your MySQL database. - Leave it blank if you do not wish to set or change the root password at this time. - -Template: mysql-community-server/re-root-pass -Type: password -Description: Re-enter root password: - Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone. - -Template: mysql-community-server/root-pass-mismatch -Type: error -Description: The two passwords did not match - Please try again. Make sure you type the exact same password twice. - -Template: mysql-community-server/remove-data-dir -Type: boolean -Default: false -Description: Remove data directory at /var/lib/mysql ? - This operation will remove the data directory that stores all the databases, tables and related meta-data. - Additionally, any import or export files stored at '/var/lib/mysql-files' will be removed along with directory. - It is highly recommended to take data backup before removing the data directory. - -Template: mysql-community-server/data-dir -Type: note -Description: Data directory found when no MySQL server package is installed - A data directory '/var/lib/mysql' is present on this system when no MySQL server - package is currently installed on the system. The directory may be under control of - server package received from third-party vendors. It may also be an unclaimed data - directory from previous removal of mysql packages. - . - It is highly recommended to take data backup. If you have not done so, now would be - the time to take backup in another shell. Once completed, press 'Ok' to continue. diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-source.install b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-source.install deleted file mode 100644 index dd7a0942..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-source.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -../*.dsc usr/src/mysql/ -../*.tar.xz usr/src/mysql/ -# legal -usr/share/doc/mysql-community-source/COPYING -usr/share/doc/mysql-community-source/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-source.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-source.lintian-overrides deleted file mode 100644 index 9ca84e90..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-source.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz -mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.dirs b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.dirs deleted file mode 100644 index f93ca25b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.install b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.install deleted file mode 100644 index d5f820dd..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/* -usr/share/man/man1/mysql-test-run.pl.1 -# legal -usr/share/doc/mysql-community-test/COPYING -usr/share/doc/mysql-community-test/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.links b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.links deleted file mode 100644 index aedf2db3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.links +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.lintian-overrides deleted file mode 100644 index ff273bbe..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-community-test.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz -mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-server.install b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-server.install deleted file mode 100644 index e3aa8de2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-server.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-server/COPYING -usr/share/doc/mysql-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-server.lintian-overrides deleted file mode 100644 index 48770976..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-server.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql -mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz -mysql-server: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-testsuite.install b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-testsuite.install deleted file mode 100644 index dfc17333..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-testsuite.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-testsuite/COPYING -usr/share/doc/mysql-testsuite/README diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-testsuite.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/mysql-testsuite.lintian-overrides deleted file mode 100644 index 37488fe6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/mysql-testsuite.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz -mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/patches/fix-man-page-links.patch b/mysql-wsrep-5.6/packaging/deb-jessie/patches/fix-man-page-links.patch deleted file mode 100644 index 004ccdf7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/patches/fix-man-page-links.patch +++ /dev/null @@ -1,14 +0,0 @@ -From: Akhil Mohan -Description: Fix path in man page link. -Bug: http://bugs.mysql.com/bug.php?id=70952 - ---- a/man/mysql_client_test_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysql_client_test_embedded.1 2013-11-14 19:29:56.768315219 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysql_client_test.1 -+.so man1/mysql_client_test.1 ---- a/man/mysqltest_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysqltest_embedded.1 2013-11-14 19:31:19.079280675 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysqltest.1 -+.so man1/mysqltest.1 diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/patches/fix-mtr-search-paths.patch b/mysql-wsrep-5.6/packaging/deb-jessie/patches/fix-mtr-search-paths.patch deleted file mode 100644 index 8a27a091..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/patches/fix-mtr-search-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -From: Akhil Mohan -Description: Adding extra search path for testsuite. - ---- a/mysql-test/lib/mtr_cases.pm 2014-02-24 13:14:37 +0530 -+++ b/mysql-test/lib/mtr_cases.pm 2014-07-02 11:46:24 +0530 -@@ -288,6 +288,7 @@ - { - $suitedir= my_find_dir($::basedir, - ["share/mysql-test/suite", -+ "lib/mysql-test/suite", - "mysql-test/suite", - "internal/mysql-test/suite", - "mysql-test", diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/patches/fix-mysql_install_db.patch b/mysql-wsrep-5.6/packaging/deb-jessie/patches/fix-mysql_install_db.patch deleted file mode 100644 index 41311b2c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/patches/fix-mysql_install_db.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Terje Røsten -Description: Maintains the pending --skip-my-cnf option in mainline -Bug: - -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 440a977..7d068fc 100644 ---- a/scripts/mysql_install_db.pl.in -+++ b/scripts/mysql_install_db.pl.in -@@ -113,6 +113,7 @@ EOF2 - print <{srcdir} and $opt->{basedir} ) - { - error($opt,"Specify either --basedir or --srcdir, not both"); - } --if ( $opt->{'keep-my-cnf'} ) -+if ( $opt->{rpm} || $opt->{'keep-my-cnf'} ) - { - $keep_my_cnf = 1; - } -@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ ) - } - - # ---------------------------------------------------------------------- --# Create database directories mysql & test -+# Create database directory mysql - # ---------------------------------------------------------------------- - - # FIXME The shell variant uses "mkdir -p": -@@ -697,7 +698,7 @@ if ($opt_user) - } - } - --foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" ) -+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql") - { - mkdir($dir, 0700) unless -d $dir; - if ($opt_user and -w "/") diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/patches/series b/mysql-wsrep-5.6/packaging/deb-jessie/patches/series deleted file mode 100644 index 31af2dc7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/patches/series +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#fix-man-page-links.patch -fix-mysql_install_db.patch -fix-mtr-search-paths.patch diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/rules b/mysql-wsrep-5.6/packaging/deb-jessie/rules deleted file mode 100755 index 92f0d1a5..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/rules +++ /dev/null @@ -1,136 +0,0 @@ -#!/usr/bin/make -f - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -%: - dh $@ - -export DH_VERBOSE=1 -export CFLAGS= -export CXXFLAGS= - -override_dh_auto_configure: - @echo "RULES.$@" - cmake . \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_MYSQLTESTDIR=lib/mysql-test \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=lib/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DWITH_SSL=bundled \ - -DWITH_ZLIB=system \ - -DWITH_EXTRA_CHARSETS=all \ - -DWITH_INNODB_MEMCACHED=1 \ - -DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \ - -DINSTALL_LAYOUT=DEB - - cat CMakeCache.txt - touch $@ - -override_dh_auto_build: - @echo "RULES.$@" - $(MAKE) -j8 VERBOSE=1 - touch $@ - -override_dh_auto_test: - @echo "RULES.$@" - echo "No tests run because test 9: pfs_connect_attr is failing unreasonably" - touch $@ - -override_dh_auto_install: - - @echo "RULES.$@" - # complete install first - $(MAKE) install DESTDIR=debian/tmp - # remove all redundant files and links - rm debian/tmp/usr/lib/*/*_r* - rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake - rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake - rm debian/tmp/usr/lib/mysql-test/Makefile - # add missing man pages - install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1 - # add MySQL Server configuration file my.cnf to mysql-common package - install -g root -o root -m 0644 -D debian/extra/my.cnf debian/tmp/etc/mysql/my.cnf - # add MySQL Server debug binary and library to package - install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug - install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a - # add debug plugin libraries to package - install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug - for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done - install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug - install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug - # add systemd script - install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/ - # add directory for legal docs - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18 - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source - # add COPYING file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING - # add README file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README - touch $@ - -override_dh_installinit: - @echo "RULES.$@" - dh_systemd_enable --name=mysql - dh_installinit --name=mysql -- defaults 19 21 - dh_systemd_start --restart-after-upgrade - touch $@ diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/source/format b/mysql-wsrep-5.6/packaging/deb-jessie/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/source/include-binaries b/mysql-wsrep-5.6/packaging/deb-jessie/source/include-binaries deleted file mode 100644 index adb5f54b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/source/include-binaries +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins -debian/extra/server-binary -debian/extra/embedded-server -debian/extra/adt_null-plugin -debian/extra/auth-plugin -debian/extra/auth_socket-plugin -debian/extra/auth_test_plugin-plugin -debian/extra/innodb_engine-plugin -debian/extra/libdaemon_example-plugin -debian/extra/libmemcached-plugin -debian/extra/mypluglib-plugin -debian/extra/mysql_no_login-plugin -debian/extra/qa_auth_client-plugin -debian/extra/qa_auth_interface-plugin -debian/extra/qa_auth_server-plugin -debian/extra/semisync_master-plugin -debian/extra/semisync_slave-plugin -debian/extra/test_udf_services-plugin -debian/extra/validate_password-plugin -debian/extra/connection_control-plugin diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/source/lintian-overrides b/mysql-wsrep-5.6/packaging/deb-jessie/source/lintian-overrides deleted file mode 100644 index 9eefbb7d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/source/lintian-overrides +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# We provide our own versioning scheme so this warning is overridden -mysql-community source: changelog-should-mention-nmu -mysql-community source: source-nmu-has-incorrect-version-number diff --git a/mysql-wsrep-5.6/packaging/deb-jessie/watch b/mysql-wsrep-5.6/packaging/deb-jessie/watch deleted file mode 100644 index c45c5e3e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-jessie/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz diff --git a/mysql-wsrep-5.6/packaging/deb-precise/changelog b/mysql-wsrep-5.6/packaging/deb-precise/changelog deleted file mode 100644 index 3773713e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/changelog +++ /dev/null @@ -1,86 +0,0 @@ -mysql-community (5.6.25-1ubuntu12.04) precise; urgency=low - - * new upstream release - * mysql-community-server now depends on perl, psmisc - mysql-community-test now depends on python, libmysqlclient-dev - (Closes: #20561621) - - -- Akhil Mohan Wed, 25 Feb 2014 22:52:19 +0530 - -mysql-community (5.6.24-1ubuntu12.04) precise; urgency=low - - * new upstream release - - -- Akhil Mohan Mon, 16 Feb 2014 15:45:09 +0530 - -mysql-community (5.6.23-1ubuntu12.04) precise; urgency=low - - * new upstream release - * dh_apparmor to now run before dh_installinit in d/rules - * mysql-community-server now recommends mysql-client - * mysql-community-server now depends on apparmor - * removed template install-test-db; not installed by default - * d/compat incremented to 9 from 8 - * d/control updated to build depend on debhelper 9 - * added d/*.lintian-overrides and d/source/lintian-overrides - * d/rules updated to reflect correct file permissions - - -- Akhil Mohan Wed, 31 Dec 2014 10:51:07 +0530 - -mysql-community (5.6.22-1ubuntu12.04) precise; urgency=low - - * new upstream release - * fixed d/*server.postinst to allow dropping test db without - setting root password - * init script will now run my_i_db if data dir is not present or empty - * updated init script to read app armor profile on startup - * added more system resources to app armor profile - - -- Akhil Mohan Wed, 24 Sep 2014 14:48:07 +0530 - -mysql-community (5.6.21-1ubuntu12.04) precise; urgency=low - - * new upstream release - * updated d/rules to increment -j8 as make option - * updated d/source/include-binaries to add mysql_no_login plugin - * updated CMake option WITH_EXTRA_CHARSETS from complex to all - - -- Akhil Mohan Wed, 20 Aug 2014 19:12:30 +0530 - -mysql-community (5.6.20-1ubuntu12.04) precise; urgency=low - - * new upstream release - * added fakeroot as build-dep in d/control - * added d/*.dirs for bench, dev and test pkg - * updated d/rules to make compilation verbose - * removed default CFLAGS, CXXFLAGS in d/rules - * added patch for testsuite search paths under d/patches - * modified cmake option for testsuite in d/rules - * updated patch d/fix-mysql_install_db.patch - * enabled two patches in d/patches/series - * removed extra permissions check in d/rules when fixed in source - * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf - * modified d/*-test.* for updated location of testsuite - * updated d/{mysql-*-server.install,rules} to include debug plugins - * updated d/rules to remove storage engine cmake options - * modified data dir permission in d/*server.{pre,post}inst - * updated d/source/include-binaries to add debug plugins - * updated d/rules to rename debug plugins - - -- Akhil Mohan Wed, 02 Jul 2014 17:45:30 +0530 - -mysql-community (5.6.19-1ubuntu12.04) precise; urgency=low - - * new upstream release - * d/rules updated to rid of files removed from source - * modified path for source tar in source pkg - * obscured actual filenames in d/source/include-binaries - * modified d/rules to handle obscured filenames - - -- Akhil Mohan Mon, 05 May 2014 15:45:10 +0530 - -mysql-community (5.6.17-1ubuntu12.04) precise; urgency=low - - * new upstream release - - -- Akhil Mohan Fri, 28 Feb 2014 18:06:30 +0530 diff --git a/mysql-wsrep-5.6/packaging/deb-precise/compat b/mysql-wsrep-5.6/packaging/deb-precise/compat deleted file mode 100644 index ec635144..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/mysql-wsrep-5.6/packaging/deb-precise/control b/mysql-wsrep-5.6/packaging/deb-precise/control deleted file mode 100644 index c65f5371..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/control +++ /dev/null @@ -1,188 +0,0 @@ -Source: mysql-community -Maintainer: MySQL Release Engineering -Section: database -Priority: optional -Standards-Version: 3.9.3 -Homepage: http://www.mysql.com/ -Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, lsb-release, cmake, fakeroot, libnuma-dev - -Package: mysql-server -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends} -Description: MySQL Server meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql server - package available in the repository. - -Package: mysql-community-server -Architecture: any -Pre-depends: debconf (>= 0.2.17), adduser -Depends: mysql-common (= ${binary:Version}), apparmor, perl, psmisc, - ${shlibs:Depends}, ${misc:Depends} -Recommends: mysql-client (= ${binary:Version}) -Conflicts: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Replaces: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Provides: virtual-mysql-server, virtual-mysql-server-core, - mysql-server-5.6, mysql-server-core-5.6 -Description: MySQL Server - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package includes the MySQL server binary as well as related - utilities to run and administer a MySQL server. - -Package: mysql-client -Architecture: any -Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends} -Description: MySQL Client meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql client - package available in the repository. - -Package: mysql-community-client -Architecture: any -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Replaces: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Provides: virtual-mysql-client, virtual-mysql-client-core, - mysql-client-5.6, mysql-client-core-5.6 -Description: MySQL Client - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the standard MySQL clients and - administration tools. - -Package: libmysqlclient18 -Architecture: any -Section: libs -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL shared client libraries - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the shared libraries for MySQL client - applications. - -Package: mysql-common -Architecture: any -Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends} -Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql -Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev -Provides: mysql-common -Description: MySQL Common - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains common files needed by MySQL client - library, MySQL database server, and MySQL embedded server. - -Package: libmysqlclient-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient18 (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL development headers - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the development header files necessary - to develop MySQL client applications. - -Package: libmysqld-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient-dev (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL embedded server library - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL server as an embedded library. - -Package: mysql-testsuite -Architecture: any -Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends} -Description: MySQL Testsuite meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql test - package available in the repository. - -Package: mysql-community-test -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - mysql-community-client (= ${binary:Version}), python, - libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5, - mysql-testsuite-5.6, mysql-commercial-test -Description: MySQL Test Run MTR - The MySQL testsuite - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL regression test suite for MySQL - database server. - -Package: mysql-community-bench -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-commercial-bench -Description: MySQL Bench - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. - -Package: mysql-community-source -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: MySQL source - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. diff --git a/mysql-wsrep-5.6/packaging/deb-precise/copyright b/mysql-wsrep-5.6/packaging/deb-precise/copyright deleted file mode 100644 index 482a6765..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/copyright +++ /dev/null @@ -1,41 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: MySQL Server 5.6 -Upstream-Contact: MySQL Release Engineering -Source: http://dev.mysql.com/ - -Copyright: 2000, 2014, Oracle and/or its affiliates. All rights reserved. -License: - This is a release of MySQL, a dual-license SQL database server. - For the avoidance of doubt, this particular copy of the software - is released under the version 2 of the GNU General Public License. - MySQL is brought to you by Oracle. - . - MySQL FOSS License Exception - We want free and open source software applications under certain - licenses to be able to use specified GPL-licensed MySQL client - libraries despite the fact that not all such FOSS licenses are - compatible with version 2 of the GNU General Public License. - Therefore there are special exceptions to the terms and conditions - of the GPLv2 as applied to these client libraries, which are - identified and described in more detail in the FOSS License - Exception at - . - . - This distribution may include materials developed by third - parties. For license and attribution notices for these - materials, please refer to the documentation that accompanies - this distribution (see the "Licenses for Third-Party Components" - appendix) or view the online documentation at - . - . - GPLv2 Disclaimer - For the avoidance of doubt, except that if any license choice - other than GPL or LGPL is available it will apply instead, - Oracle elects to use only the General Public License version 2 - (GPLv2) at this time for any software where a choice of GPL - license versions is made available with the language indicating - that GPLv2 or any later version may be used, or where a choice - . - The full text of the GNU General Public License version 2 can - be found in the file - `/usr/share/mysql/doc/COPYING'. diff --git a/mysql-wsrep-5.6/packaging/deb-precise/extra/apparmor-profile b/mysql-wsrep-5.6/packaging/deb-precise/extra/apparmor-profile deleted file mode 100644 index ca5d1f58..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/extra/apparmor-profile +++ /dev/null @@ -1,53 +0,0 @@ -# vim:syntax=apparmor -# Last Modified: Fri Feb 28 18:06:30 2014 -#include - -/usr/sbin/mysqld { - #include - #include - #include - -# Allow system resource access - /sys/devices/system/cpu/ r, - capability sys_resource, - capability dac_override, - capability setuid, - capability setgid, - -# Allow config access - /etc/mysql/conf.d/ r, - /etc/mysql/conf.d/*.cnf r, - /etc/mysql/*.cnf r, - -# Allow pid and socket file access - /run/mysqld/mysqld.pid rw, - /run/mysqld/mysqld.sock rw, - -# Allow read/ write to /tmp - /tmp/ r, - /tmp/* rw, - -# Allow execution of server binary - /usr/sbin/mysqld mr, - /usr/sbin/mysqld-debug mr, - -# Allow plugin access - /usr/lib/mysql/plugin/ r, - /usr/lib/mysql/plugin/*.so* mr, - -# Allow error msg and charset access - /usr/share/mysql/ r, - /usr/share/mysql/** r, - -# Allow data dir access - /var/lib/mysql/ r, - /var/lib/mysql/** rwk, - -# Allow data files dir access - /var/lib/mysql-files/ r, - /var/lib/mysql-files/** rwk, - -# Allow log file access - /var/log/mysql/ r, - /var/log/mysql/** rw, -} diff --git a/mysql-wsrep-5.6/packaging/deb-precise/extra/my.cnf b/mysql-wsrep-5.6/packaging/deb-precise/extra/my.cnf deleted file mode 100644 index a2b2fd8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/extra/my.cnf +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Community Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[client] -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[mysqld_safe] -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -explicit_defaults_for_timestamp - -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 - -log-error = /var/log/mysql/error.log - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-precise/extra/mysql_embedded.1 b/mysql-wsrep-5.6/packaging/deb-precise/extra/mysql_embedded.1 deleted file mode 100644 index 735c4e05..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/extra/mysql_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysql.1 diff --git a/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient-dev.dirs b/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient-dev.dirs deleted file mode 100644 index 2772b113..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient-dev.dirs +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql -usr/include/mysql/mysql diff --git a/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient-dev.install b/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient-dev.install deleted file mode 100644 index 6794f18c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient-dev.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql/*.h -usr/include/mysql/mysql/*.h -usr/include/mysql/mysql/*.h.pp -usr/include/mysql/mysql/psi/*.h -usr/lib/*/libmysqlclient.a -usr/lib/*/libmysqlclient.so -usr/lib/*/libmysqlservices.a -usr/bin/mysql_config -usr/bin/mysql_config_editor -usr/share/man/man1/mysql_config.1 -usr/share/man/man1/mysql_config_editor.1 -# legal -usr/share/doc/libmysqlclient-dev/COPYING -usr/share/doc/libmysqlclient-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient-dev.lintian-overrides deleted file mode 100644 index 09960eb2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient-dev.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz -libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient-dev: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient18.install b/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient18.install deleted file mode 100644 index cdfdaa60..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient18.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqlclient.so.* -# legal -usr/share/doc/libmysqlclient18/COPYING -usr/share/doc/libmysqlclient18/README diff --git a/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient18.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient18.lintian-overrides deleted file mode 100644 index 1f26511a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/libmysqlclient18.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz -libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient18: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-precise/libmysqld-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/libmysqld-dev.lintian-overrides deleted file mode 100644 index 35caaeca..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/libmysqld-dev.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz -libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-client.install b/mysql-wsrep-5.6/packaging/deb-precise/mysql-client.install deleted file mode 100644 index 0a24793e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-client.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-client/COPYING -usr/share/doc/mysql-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/mysql-client.lintian-overrides deleted file mode 100644 index 5c4891c9..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-client.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql -mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz -mysql-client: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-common.dirs b/mysql-wsrep-5.6/packaging/deb-precise/mysql-common.dirs deleted file mode 100644 index a3b0c16a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-common.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-common.install b/mysql-wsrep-5.6/packaging/deb-precise/mysql-common.install deleted file mode 100644 index 2a547a80..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-common.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/my.cnf -usr/share/aclocal/mysql.m4 -usr/share/mysql/docs/INFO_SRC -usr/share/mysql/docs/INFO_BIN -usr/share/mysql/docs/ChangeLog -# localized error msgs -usr/share/mysql/*/errmsg.sys -usr/share/mysql/errmsg-utf8.txt -# charsets -usr/share/mysql/charsets/*.xml -usr/share/mysql/charsets/README -# legal -usr/share/doc/mysql-common/COPYING -usr/share/doc/mysql-common/README diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-common.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/mysql-common.lintian-overrides deleted file mode 100644 index 70ddcdf6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-common.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql -mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz -mysql-common: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-bench.dirs b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-bench.dirs deleted file mode 100644 index 9d0acf49..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-bench.dirs +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql -usr/lib/mysql/sql-bench diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-bench.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-bench.lintian-overrides deleted file mode 100644 index 04df14ea..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-bench.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz -mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-client.install b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-client.install deleted file mode 100644 index c6a27ce6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-client.install +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/innochecksum -usr/bin/myisam_ftdump -usr/bin/mysql -usr/bin/mysql_embedded -usr/bin/mysqlaccess -usr/bin/mysqlaccess.conf -usr/bin/mysqladmin -usr/bin/mysqlbug -usr/bin/mysqlcheck -usr/bin/mysql_client_test -usr/bin/mysql_client_test_embedded -usr/bin/mysqldump -usr/bin/mysqldumpslow -usr/bin/mysql_find_rows -usr/bin/mysql_fix_extensions -usr/bin/mysqlimport -usr/bin/mysql_plugin -usr/bin/mysqlshow -usr/bin/mysqlslap -usr/bin/mysql_waitpid -# man pages -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/myisam_ftdump.1 -usr/share/man/man1/mysql.1 -usr/share/man/man1/mysql_embedded.1 -usr/share/man/man1/mysqlaccess.1 -usr/share/man/man1/mysqladmin.1 -usr/share/man/man1/mysqlbug.1 -usr/share/man/man1/mysqlcheck.1 -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqldump.1 -usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 -usr/share/man/man1/mysqlimport.1 -usr/share/man/man1/mysqlman.1 -usr/share/man/man1/mysql_plugin.1 -usr/share/man/man1/mysqlshow.1 -usr/share/man/man1/mysqlslap.1 -usr/share/man/man1/mysql_waitpid.1 -# legal -usr/share/doc/mysql-community-client/COPYING -usr/share/doc/mysql-community-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-client.lintian-overrides deleted file mode 100644 index 58929356..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-client.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql -mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz -mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-client: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.config b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.config deleted file mode 100755 index cb6c39cf..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.config +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -if [ "$1" = "configure" ] && [ -z "$2" ]; -then - - set -e - - PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server - INSTALLED_PKG=none - MYSQLDATA=/var/lib/mysql - - IFS_BACKUP=${IFS} - IFS=":" - for PKG in ${PKG_LIST}; - do - STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4) - if [ "${STATUS}" = "installed" ]; - then - INSTALLED_PKG=${PKG} - break - fi - done - IFS=${IFS_BACKUP} - - if [ "${INSTALLED_PKG}" = "none" ]; - then - if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ]; - then - db_input high mysql-community-server/data-dir || true - else - db_fset mysql-community-server/data-dir seen true - fi - - while :; do - PASSWD="" - db_input high mysql-community-server/root-pass || true - db_go - - db_get mysql-community-server/root-pass - if [ -z "${RET}" ]; - then - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - break - fi - PASSWD="${RET}" - - db_input high mysql-community-server/re-root-pass || true - db_go - - db_get mysql-community-server/re-root-pass - if [ "${RET}" == "${PASSWD}" ]; - then - PASSWD="" - break - fi - - db_fset mysql-community-server/root-pass-mismatch seen false - db_input critical mysql-community-server/root-pass-mismatch - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - done - - else - db_fset mysql-community-server/data-dir seen true - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - fi - - set +e -fi diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.dirs b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.dirs deleted file mode 100644 index f677b6f3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.dirs +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d -etc/init.d -usr/lib/mysql -usr/lib/mysql/plugin diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.install b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.install deleted file mode 100644 index a1f5d053..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.install +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/msql2mysql -usr/bin/myisamchk -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/my_print_defaults -usr/bin/mysqlbinlog -usr/bin/mysql_convert_table_format -usr/bin/mysqld_multi -usr/bin/mysqld_safe -usr/bin/mysqlhotcopy -usr/bin/mysql_install_db -usr/bin/mysql_secure_installation -usr/bin/mysql_setpermission -usr/bin/mysqltest -usr/bin/mysqltest_embedded -usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_zap -usr/bin/perror -usr/bin/replace -usr/bin/resolveip -usr/bin/resolve_stack_dump -usr/sbin/mysqld -# debug binary -usr/sbin/mysqld-debug -# man pages -usr/share/man/man1/comp_err.1 -usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 -usr/share/man/man1/myisamlog.1 -usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql.server.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql-stress-test.pl.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man1/mysql_zap.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 -usr/share/man/man1/resolve_stack_dump.1 -usr/share/man/man8/mysqld.8 -# app armor profile -etc/apparmor.d/usr.sbin.mysqld -# SQL files -usr/share/mysql/*.sql -# plugins -usr/lib/mysql/plugin/*.so -usr/lib/mysql/plugin/debug/*.so -usr/lib/mysql/plugin/daemon_example.ini -usr/lib/mysql/plugin/debug/daemon_example.ini -# support files -usr/share/mysql/mysqld_multi.server -usr/share/mysql/magic -usr/share/mysql/mysql-log-rotate -usr/share/mysql/my-default.cnf -usr/share/mysql/dictionary.txt -# legal -usr/share/doc/mysql-community-server/COPYING -usr/share/doc/mysql-community-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.lintian-overrides deleted file mode 100644 index 08b38654..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.lintian-overrides +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz -mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-server: embedded-library -# Since we ship debug plugins so this error is overridden -mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/* diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.mysql.init b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.mysql.init deleted file mode 100755 index 475ce0fe..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.mysql.init +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $time -# Should-Stop: $network $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/ Stop MySQL Community Server daemon -# Description: This service script facilitates startup and shutdown of -# mysqld daemon throught its wrapper script mysqld_safe -### END INIT INFO -# - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /lib/lsb/init-functions - -cd / -umask 077 - -MYSQLDATA=/var/lib/mysql -VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4) - -get_mysql_option() { - RESULT=$(my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1) - if [ -z "$RESULT" ]; - then - RESULT="$3" - fi - echo $RESULT -} - -get_running () { - PIDFILE=$(get_mysql_option mysqld_safe pid-file "") - if [ -z "$PIDFILE" ]; - then - PIDFILE=$(get_mysql_option mysqld pid-file "$MYSQLDATA/$(hostname).pid") - fi - if [ -e "$PIDFILE" ] && [ -d "/proc/$(cat "$PIDFILE")" ]; - then - echo 1 - else - echo 0 - fi -} - -server_stop () { - RUNNING=$(get_running) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${RUNNING}" -eq 0 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - RUNNING=$(get_running) - sleep 1 - done - return 0 -} - -case "$1" in - 'start') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "A MySQL Server is already started" - else - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - /lib/init/apparmor-profile-load usr.sbin.mysqld - - su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &" - for i in 1 2 3 4 5 6; - do - sleep 1 - echo -n . - done - echo - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is started" - else - log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details." - fi - fi - ;; - - 'stop') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - killall -15 mysqld - server_stop - if [ "$?" -eq 0 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is stopped" - else - log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out" - fi - else - log_action_msg "MySQL Community Server ${VERSION} is already stopped" - fi - ;; - - 'restart'|'reload'|'force-reload') - log_action_msg "Stopping MySQL Community Server ${VERSION}" - $0 stop - log_action_msg "Re-starting MySQL Community Server ${VERSION}" - $0 start - ;; - - 'status') - RUNNING=$(get_running) - if [ ${RUNNING} -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is running" - else - log_action_msg "MySQL Community Server ${VERSION} is not running" - exit 3 - fi - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.postinst b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.postinst deleted file mode 100755 index 0fe3dc12..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.postinst +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -take_upstart_job_backup () { - if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ]; - then - mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup - fi -} - -case "$1" in - configure) - -# MySQL 5.6.34 needs this - MYSQLFILES=/var/lib/mysql-files - if [ ! -d ${MYSQLFILES} -a ! -L ${MYSQLFILES} ]; - then - mkdir ${MYSQLFILES} - chown mysql:mysql ${MYSQLFILES} - chmod 770 ${MYSQLFILES} - fi - - if [ -z "$2" ]; - then - set -e - - MYSQLDATA=/var/lib/mysql - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - fi - - db_get mysql-community-server/root-pass && PASSWD=${RET} - if [ ! -z "${PASSWD}" ]; - then - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';" - else - PASSWD="" - fi - - SQL=`mktemp` - if [ -f "${SQL}" ]; - then - chmod 700 ${SQL} - cat << EOF > ${SQL} -USE mysql; -${PASSWD} -DELETE FROM user WHERE user=''; -FLUSH PRIVILEGES; -EOF - mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL - PASSWD="" - rm -f ${SQL} - fi - - set +e - - fi - - ;; - - abort-upgrade|abort-remove|abort-configure) - - ;; - - *) - exit 1 - ;; -esac - -db_stop - -take_upstart_job_backup - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.postrm b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.postrm deleted file mode 100755 index 55f83a3b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.postrm +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; -then -. /usr/share/debconf/confmodule -fi - -place_upstart_job_back () { - if [ -e "/var/lib/mysql/.mysql.conf.backup" ]; - then - mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf - fi -} - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - remove) - - set -e - - place_upstart_job_back - - set +e - - ;; - - purge) - - set -e - - place_upstart_job_back - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - MYSQLFILES=/var/lib/mysql-files - - server_stop - - db_input high mysql-community-server/remove-data-dir || true - db_go - db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET} - if [ "${RMDATADIR}" = "true" ]; - then - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if [ -d ${MYSQLFILES} ] || [ -L ${MYSQLFILES} ]; - then - rm -rf ${MYSQLFILES} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - abort-install) - - set -e - - place_upstart_job_back - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql start || exit $? - else - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if [ -d ${MYSQLFILES} ] || [ -L ${MYSQLFILES} ]; - then - rm -rf ${MYSQLFILES} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - upgrade|abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.preinst b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.preinst deleted file mode 100755 index e5b3b771..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.preinst +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - install) - - if [ -z "$2" ]; - then - - set -e - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql stop || exit $? - server_stop - fi - - MYSQLDATA=/var/lib/mysql - MYSQLFILES=/var/lib/mysql-files - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - if ! getent group mysql >/dev/null; - then - addgroup --system mysql >/dev/null - fi - - if ! getent passwd mysql >/dev/null; - then - adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null - fi - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d ${MYSQLFILES} -a ! -L ${MYSQLFILES} ]; - then - mkdir ${MYSQLFILES} - chown mysql:mysql ${MYSQLFILES} - chmod 770 ${MYSQLFILES} - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - set +e - - fi - - ;; - - upgrade) - - set -e - - #DEBHELPER# - server_stop - - set +e - - ;; - - abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.prerm b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.prerm deleted file mode 100755 index 7509de7a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.prerm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -#DEBHELPER# - -set +e - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.templates b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.templates deleted file mode 100644 index 2469d917..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-server.templates +++ /dev/null @@ -1,34 +0,0 @@ -Template: mysql-community-server/root-pass -Type: password -Description: Enter root password: - Please provide a strong password that will be set for the root account of your MySQL database. - Leave it blank if you do not wish to set or change the root password at this time. - -Template: mysql-community-server/re-root-pass -Type: password -Description: Re-enter root password: - Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone. - -Template: mysql-community-server/root-pass-mismatch -Type: error -Description: The two passwords did not match - Please try again. Make sure you type the exact same password twice. - -Template: mysql-community-server/remove-data-dir -Type: boolean -Default: false -Description: Remove data directory at /var/lib/mysql ? - This operation will remove the data directory that stores all the databases, tables and related meta-data. - Additionally, any import or export files stored at '/var/lib/mysql-files' will be removed along with directory. - It is highly recommended to take data backup before removing the data directory. - -Template: mysql-community-server/data-dir -Type: note -Description: Data directory found when no MySQL server package is installed - A data directory '/var/lib/mysql' is present on this system when no MySQL server - package is currently installed on the system. The directory may be under control of - server package received from third-party vendors. It may also be an unclaimed data - directory from previous removal of mysql packages. - . - It is highly recommended to take data backup. If you have not done so, now would be - the time to take backup in another shell. Once completed, press 'Ok' to continue. diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-source.install b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-source.install deleted file mode 100644 index 326c5dfb..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-source.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -../*.dsc usr/src/mysql/ -../*.tar.gz usr/src/mysql/ -# legal -usr/share/doc/mysql-community-source/COPYING -usr/share/doc/mysql-community-source/README diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-source.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-source.lintian-overrides deleted file mode 100644 index 9ca84e90..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-source.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz -mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.dirs b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.dirs deleted file mode 100644 index f93ca25b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.install b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.install deleted file mode 100644 index d5f820dd..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/* -usr/share/man/man1/mysql-test-run.pl.1 -# legal -usr/share/doc/mysql-community-test/COPYING -usr/share/doc/mysql-community-test/README diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.links b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.links deleted file mode 100644 index aedf2db3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.links +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.lintian-overrides deleted file mode 100644 index ff273bbe..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-community-test.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz -mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-server.install b/mysql-wsrep-5.6/packaging/deb-precise/mysql-server.install deleted file mode 100644 index 07f36ef5..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-server.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-server/COPYING -usr/share/doc/mysql-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/mysql-server.lintian-overrides deleted file mode 100644 index 48770976..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-server.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql -mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz -mysql-server: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-testsuite.install b/mysql-wsrep-5.6/packaging/deb-precise/mysql-testsuite.install deleted file mode 100644 index 6a6e5f50..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-testsuite.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-testsuite/COPYING -usr/share/doc/mysql-testsuite/README diff --git a/mysql-wsrep-5.6/packaging/deb-precise/mysql-testsuite.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-precise/mysql-testsuite.lintian-overrides deleted file mode 100644 index 37488fe6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/mysql-testsuite.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz -mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-precise/patches/fix-man-page-links.patch b/mysql-wsrep-5.6/packaging/deb-precise/patches/fix-man-page-links.patch deleted file mode 100644 index 004ccdf7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/patches/fix-man-page-links.patch +++ /dev/null @@ -1,14 +0,0 @@ -From: Akhil Mohan -Description: Fix path in man page link. -Bug: http://bugs.mysql.com/bug.php?id=70952 - ---- a/man/mysql_client_test_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysql_client_test_embedded.1 2013-11-14 19:29:56.768315219 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysql_client_test.1 -+.so man1/mysql_client_test.1 ---- a/man/mysqltest_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysqltest_embedded.1 2013-11-14 19:31:19.079280675 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysqltest.1 -+.so man1/mysqltest.1 diff --git a/mysql-wsrep-5.6/packaging/deb-precise/patches/fix-mtr-search-paths.patch b/mysql-wsrep-5.6/packaging/deb-precise/patches/fix-mtr-search-paths.patch deleted file mode 100644 index 8a27a091..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/patches/fix-mtr-search-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -From: Akhil Mohan -Description: Adding extra search path for testsuite. - ---- a/mysql-test/lib/mtr_cases.pm 2014-02-24 13:14:37 +0530 -+++ b/mysql-test/lib/mtr_cases.pm 2014-07-02 11:46:24 +0530 -@@ -288,6 +288,7 @@ - { - $suitedir= my_find_dir($::basedir, - ["share/mysql-test/suite", -+ "lib/mysql-test/suite", - "mysql-test/suite", - "internal/mysql-test/suite", - "mysql-test", diff --git a/mysql-wsrep-5.6/packaging/deb-precise/patches/fix-mysql_install_db.patch b/mysql-wsrep-5.6/packaging/deb-precise/patches/fix-mysql_install_db.patch deleted file mode 100644 index 41311b2c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/patches/fix-mysql_install_db.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Terje Røsten -Description: Maintains the pending --skip-my-cnf option in mainline -Bug: - -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 440a977..7d068fc 100644 ---- a/scripts/mysql_install_db.pl.in -+++ b/scripts/mysql_install_db.pl.in -@@ -113,6 +113,7 @@ EOF2 - print <{srcdir} and $opt->{basedir} ) - { - error($opt,"Specify either --basedir or --srcdir, not both"); - } --if ( $opt->{'keep-my-cnf'} ) -+if ( $opt->{rpm} || $opt->{'keep-my-cnf'} ) - { - $keep_my_cnf = 1; - } -@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ ) - } - - # ---------------------------------------------------------------------- --# Create database directories mysql & test -+# Create database directory mysql - # ---------------------------------------------------------------------- - - # FIXME The shell variant uses "mkdir -p": -@@ -697,7 +698,7 @@ if ($opt_user) - } - } - --foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" ) -+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql") - { - mkdir($dir, 0700) unless -d $dir; - if ($opt_user and -w "/") diff --git a/mysql-wsrep-5.6/packaging/deb-precise/patches/series b/mysql-wsrep-5.6/packaging/deb-precise/patches/series deleted file mode 100644 index 31af2dc7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/patches/series +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#fix-man-page-links.patch -fix-mysql_install_db.patch -fix-mtr-search-paths.patch diff --git a/mysql-wsrep-5.6/packaging/deb-precise/rules b/mysql-wsrep-5.6/packaging/deb-precise/rules deleted file mode 100755 index 8e4ab949..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/rules +++ /dev/null @@ -1,135 +0,0 @@ -#!/usr/bin/make -f - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -%: - dh $@ - -export DH_VERBOSE=1 -export CFLAGS= -export CXXFLAGS= - -override_dh_auto_configure: - @echo "RULES.$@" - cmake . \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_MYSQLTESTDIR=lib/mysql-test \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=lib/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DWITH_SSL=bundled \ - -DWITH_ZLIB=system \ - -DWITH_EXTRA_CHARSETS=all \ - -DWITH_INNODB_MEMCACHED=1 \ - -DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \ - -DINSTALL_LAYOUT=DEB - - cat CMakeCache.txt - touch $@ - -override_dh_auto_build: - @echo "RULES.$@" - $(MAKE) -j8 VERBOSE=1 - touch $@ - -override_dh_auto_test: - @echo "RULES.$@" - echo "No tests run because test 9: pfs_connect_attr is failing unreasonably" - touch $@ - -override_dh_auto_install: - - @echo "RULES.$@" - # complete install first - $(MAKE) install DESTDIR=debian/tmp - # remove all redundant files and links - rm debian/tmp/usr/lib/*/*_r* - rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake - rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake - rm debian/tmp/usr/lib/mysql-test/Makefile - # add missing man pages - install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1 - # add MySQL Server configuration file my.cnf to mysql-common package - install -g root -o root -m 0644 -D debian/extra/my.cnf debian/tmp/etc/mysql/my.cnf - # add MySQL Server debug binary and library to package - install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug - install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a - # add debug plugin libraries to package - install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug - for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done - install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug - install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug - # add apparmor profile - install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld - # add directory for legal docs - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18 - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source - # add COPYING file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING - # add README file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README - touch $@ - -override_dh_installinit: - @echo "RULES.$@" - dh_apparmor -pmysql-community-server --profile-name=usr.sbin.mysqld - dh_installinit --name=mysql -- defaults 19 21 - touch $@ diff --git a/mysql-wsrep-5.6/packaging/deb-precise/source/format b/mysql-wsrep-5.6/packaging/deb-precise/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/mysql-wsrep-5.6/packaging/deb-precise/source/include-binaries b/mysql-wsrep-5.6/packaging/deb-precise/source/include-binaries deleted file mode 100644 index adb5f54b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/source/include-binaries +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins -debian/extra/server-binary -debian/extra/embedded-server -debian/extra/adt_null-plugin -debian/extra/auth-plugin -debian/extra/auth_socket-plugin -debian/extra/auth_test_plugin-plugin -debian/extra/innodb_engine-plugin -debian/extra/libdaemon_example-plugin -debian/extra/libmemcached-plugin -debian/extra/mypluglib-plugin -debian/extra/mysql_no_login-plugin -debian/extra/qa_auth_client-plugin -debian/extra/qa_auth_interface-plugin -debian/extra/qa_auth_server-plugin -debian/extra/semisync_master-plugin -debian/extra/semisync_slave-plugin -debian/extra/test_udf_services-plugin -debian/extra/validate_password-plugin -debian/extra/connection_control-plugin diff --git a/mysql-wsrep-5.6/packaging/deb-precise/watch b/mysql-wsrep-5.6/packaging/deb-precise/watch deleted file mode 100644 index c45c5e3e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-precise/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/changelog b/mysql-wsrep-5.6/packaging/deb-trusty/changelog deleted file mode 100644 index 16f83c93..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/changelog +++ /dev/null @@ -1,93 +0,0 @@ -mysql-community (5.6.25-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * mysql-community-server now depends on perl, psmisc - mysql-community-test now depends on python, libmysqlclient-dev - (Closes: #20561621) - - -- Akhil Mohan Wed, 25 Feb 2014 22:52:19 +0530 - -mysql-community (5.6.24-1ubuntu14.04) trusty; urgency=low - - * new upstream release - - -- Akhil Mohan Mon, 16 Feb 2014 15:45:09 +0530 - -mysql-community (5.6.23-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * dh_apparmor to now run before dh_installinit in d/rules - * mysql-community-server now recommends mysql-client - * mysql-community-server now depends on apparmor - * removed template install-test-db; not installed by default - * d/compat incremented to 9 from 8 - * d/control updated to build depend on debhelper 9 - * added d/*.lintian-overrides and d/source/lintian-overrides - * d/rules updated to reflect correct file permissions - - -- Akhil Mohan Wed, 31 Dec 2014 10:51:07 +0530 - -mysql-community (5.6.22-2ubuntu14.04) trusty; urgency=low - - * new upstream release - * mysql-common now replaces mysql-server-{,core-}5.6 - - -- Akhil Mohan Wed, 28 Nov 2014 15:18:07 +0530 - -mysql-community (5.6.22-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * fixed d/*server.postinst to allow dropping test db without - setting root password - * init script will now run my_i_db if data dir is not present or empty - * updated init script to read app armor profile on startup - * added more system resources to app armor profile - - -- Akhil Mohan Wed, 24 Sep 2014 14:48:07 +0530 - -mysql-community (5.6.21-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * updated d/rules to increment -j8 as make option - * updated d/source/include-binaries to add mysql_no_login plugin - * updated CMake option WITH_EXTRA_CHARSETS from complex to all - - -- Akhil Mohan Wed, 20 Aug 2014 19:12:30 +0530 - -mysql-community (5.6.20-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * added fakeroot as build-dep in d/control - * added d/*.dirs for bench, dev and test pkg - * updated d/rules to make compilation verbose - * removed default CFLAGS, CXXFLAGS in d/rules - * added patch for testsuite search paths under d/patches - * modified cmake option for testsuite in d/rules - * updated patch d/fix-mysql_install_db.patch - * enabled two patches in d/patches/series - * removed extra permissions check in d/rules when fixed in source - * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf - * modified d/*-test.* for updated location of testsuite - * updated d/{mysql-*-server.install,rules} to include debug plugins - * updated d/rules to remove storage engine cmake options - * modified data dir permission in d/*server.{pre,post}inst - * updated d/source/include-binaries to add debug plugins - * updated d/rules to rename debug plugins - - -- Akhil Mohan Wed, 02 Jul 2014 17:45:30 +0530 - -mysql-community (5.6.19-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * d/rules updated to rid of files removed from source - * modified path for source tar in source pkg - * obscured actual filenames in d/source/include-binaries - * modified d/rules to handle obscured filenames - - -- Akhil Mohan Mon, 05 May 2014 15:45:10 +0530 - -mysql-community (5.6.17-1ubuntu14.04) trusty; urgency=low - - * new upstream release - - -- Akhil Mohan Fri, 28 Feb 2014 18:06:30 +0530 diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/compat b/mysql-wsrep-5.6/packaging/deb-trusty/compat deleted file mode 100644 index ec635144..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/control b/mysql-wsrep-5.6/packaging/deb-trusty/control deleted file mode 100644 index c40f032d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/control +++ /dev/null @@ -1,189 +0,0 @@ -Source: mysql-community -Maintainer: MySQL Release Engineering -Section: database -Priority: optional -Standards-Version: 3.9.5 -Homepage: http://www.mysql.com/ -Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, lsb-release, cmake, fakeroot, libnuma-dev - -Package: mysql-server -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends} -Description: MySQL Server meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql server - package available in the repository. - -Package: mysql-community-server -Architecture: any -Pre-depends: debconf (>= 0.2.17), adduser -Depends: mysql-common (= ${binary:Version}), apparmor, perl, psmisc, - ${shlibs:Depends}, ${misc:Depends} -Recommends: mysql-client (= ${binary:Version}) -Conflicts: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Replaces: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Provides: virtual-mysql-server, virtual-mysql-server-core, - mysql-server-5.6, mysql-server-core-5.6 -Description: MySQL Server - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package includes the MySQL server binary as well as related - utilities to run and administer a MySQL server. - -Package: mysql-client -Architecture: any -Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends} -Description: MySQL Client meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql client - package available in the repository. - -Package: mysql-community-client -Architecture: any -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Replaces: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Provides: virtual-mysql-client, virtual-mysql-client-core, - mysql-client-5.6, mysql-client-core-5.6 -Description: MySQL Client - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the standard MySQL clients and - administration tools. - -Package: libmysqlclient18 -Architecture: any -Section: libs -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL shared client libraries - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the shared libraries for MySQL client - applications. - -Package: mysql-common -Architecture: any -Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends} -Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql -Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev, - mysql-server-5.6, mysql-server-core-5.6 -Provides: mysql-common -Description: MySQL Common - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains common files needed by MySQL client - library, MySQL database server, and MySQL embedded server. - -Package: libmysqlclient-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient18 (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL development headers - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the development header files necessary - to develop MySQL client applications. - -Package: libmysqld-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient-dev (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL embedded server library - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL server as an embedded library. - -Package: mysql-testsuite -Architecture: any -Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends} -Description: MySQL Testsuite meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql test - package available in the repository. - -Package: mysql-community-test -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - mysql-community-client (= ${binary:Version}), python, - libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5, - mysql-testsuite-5.6, mysql-commercial-test -Description: MySQL Test Run MTR - The MySQL testsuite - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL regression test suite for MySQL - database server. - -Package: mysql-community-bench -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-commercial-bench -Description: MySQL Bench - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. - -Package: mysql-community-source -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: MySQL source - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/copyright b/mysql-wsrep-5.6/packaging/deb-trusty/copyright deleted file mode 100644 index 482a6765..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/copyright +++ /dev/null @@ -1,41 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: MySQL Server 5.6 -Upstream-Contact: MySQL Release Engineering -Source: http://dev.mysql.com/ - -Copyright: 2000, 2014, Oracle and/or its affiliates. All rights reserved. -License: - This is a release of MySQL, a dual-license SQL database server. - For the avoidance of doubt, this particular copy of the software - is released under the version 2 of the GNU General Public License. - MySQL is brought to you by Oracle. - . - MySQL FOSS License Exception - We want free and open source software applications under certain - licenses to be able to use specified GPL-licensed MySQL client - libraries despite the fact that not all such FOSS licenses are - compatible with version 2 of the GNU General Public License. - Therefore there are special exceptions to the terms and conditions - of the GPLv2 as applied to these client libraries, which are - identified and described in more detail in the FOSS License - Exception at - . - . - This distribution may include materials developed by third - parties. For license and attribution notices for these - materials, please refer to the documentation that accompanies - this distribution (see the "Licenses for Third-Party Components" - appendix) or view the online documentation at - . - . - GPLv2 Disclaimer - For the avoidance of doubt, except that if any license choice - other than GPL or LGPL is available it will apply instead, - Oracle elects to use only the General Public License version 2 - (GPLv2) at this time for any software where a choice of GPL - license versions is made available with the language indicating - that GPLv2 or any later version may be used, or where a choice - . - The full text of the GNU General Public License version 2 can - be found in the file - `/usr/share/mysql/doc/COPYING'. diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/extra/apparmor-profile b/mysql-wsrep-5.6/packaging/deb-trusty/extra/apparmor-profile deleted file mode 100644 index ca5d1f58..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/extra/apparmor-profile +++ /dev/null @@ -1,53 +0,0 @@ -# vim:syntax=apparmor -# Last Modified: Fri Feb 28 18:06:30 2014 -#include - -/usr/sbin/mysqld { - #include - #include - #include - -# Allow system resource access - /sys/devices/system/cpu/ r, - capability sys_resource, - capability dac_override, - capability setuid, - capability setgid, - -# Allow config access - /etc/mysql/conf.d/ r, - /etc/mysql/conf.d/*.cnf r, - /etc/mysql/*.cnf r, - -# Allow pid and socket file access - /run/mysqld/mysqld.pid rw, - /run/mysqld/mysqld.sock rw, - -# Allow read/ write to /tmp - /tmp/ r, - /tmp/* rw, - -# Allow execution of server binary - /usr/sbin/mysqld mr, - /usr/sbin/mysqld-debug mr, - -# Allow plugin access - /usr/lib/mysql/plugin/ r, - /usr/lib/mysql/plugin/*.so* mr, - -# Allow error msg and charset access - /usr/share/mysql/ r, - /usr/share/mysql/** r, - -# Allow data dir access - /var/lib/mysql/ r, - /var/lib/mysql/** rwk, - -# Allow data files dir access - /var/lib/mysql-files/ r, - /var/lib/mysql-files/** rwk, - -# Allow log file access - /var/log/mysql/ r, - /var/log/mysql/** rw, -} diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/extra/my.cnf b/mysql-wsrep-5.6/packaging/deb-trusty/extra/my.cnf deleted file mode 100644 index a2b2fd8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/extra/my.cnf +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Community Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[client] -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[mysqld_safe] -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -explicit_defaults_for_timestamp - -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 - -log-error = /var/log/mysql/error.log - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/extra/mysql_embedded.1 b/mysql-wsrep-5.6/packaging/deb-trusty/extra/mysql_embedded.1 deleted file mode 100644 index 735c4e05..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/extra/mysql_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysql.1 diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient-dev.install b/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient-dev.install deleted file mode 100644 index 6794f18c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient-dev.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql/*.h -usr/include/mysql/mysql/*.h -usr/include/mysql/mysql/*.h.pp -usr/include/mysql/mysql/psi/*.h -usr/lib/*/libmysqlclient.a -usr/lib/*/libmysqlclient.so -usr/lib/*/libmysqlservices.a -usr/bin/mysql_config -usr/bin/mysql_config_editor -usr/share/man/man1/mysql_config.1 -usr/share/man/man1/mysql_config_editor.1 -# legal -usr/share/doc/libmysqlclient-dev/COPYING -usr/share/doc/libmysqlclient-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient-dev.lintian-overrides deleted file mode 100644 index 09960eb2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient-dev.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz -libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient-dev: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient18.install b/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient18.install deleted file mode 100644 index cdfdaa60..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient18.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqlclient.so.* -# legal -usr/share/doc/libmysqlclient18/COPYING -usr/share/doc/libmysqlclient18/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient18.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient18.lintian-overrides deleted file mode 100644 index 1f26511a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqlclient18.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz -libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient18: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqld-dev.install b/mysql-wsrep-5.6/packaging/deb-trusty/libmysqld-dev.install deleted file mode 100644 index f2b59fcb..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqld-dev.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqld.a -usr/lib/*/libmysqld-debug.a -# legal -usr/share/doc/libmysqld-dev/COPYING -usr/share/doc/libmysqld-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqld-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/libmysqld-dev.lintian-overrides deleted file mode 100644 index 35caaeca..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/libmysqld-dev.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz -libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-client.install b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-client.install deleted file mode 100644 index 0a24793e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-client.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-client/COPYING -usr/share/doc/mysql-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-client.lintian-overrides deleted file mode 100644 index 5c4891c9..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-client.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql -mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz -mysql-client: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-common.dirs b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-common.dirs deleted file mode 100644 index a3b0c16a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-common.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-common.install b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-common.install deleted file mode 100644 index 2a547a80..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-common.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/my.cnf -usr/share/aclocal/mysql.m4 -usr/share/mysql/docs/INFO_SRC -usr/share/mysql/docs/INFO_BIN -usr/share/mysql/docs/ChangeLog -# localized error msgs -usr/share/mysql/*/errmsg.sys -usr/share/mysql/errmsg-utf8.txt -# charsets -usr/share/mysql/charsets/*.xml -usr/share/mysql/charsets/README -# legal -usr/share/doc/mysql-common/COPYING -usr/share/doc/mysql-common/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-common.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-common.lintian-overrides deleted file mode 100644 index 70ddcdf6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-common.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql -mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz -mysql-common: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-bench.install b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-bench.install deleted file mode 100644 index 8aa8be6f..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-bench.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql/sql-bench/* -# legal -usr/share/doc/mysql-community-bench/COPYING -usr/share/doc/mysql-community-bench/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-bench.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-bench.lintian-overrides deleted file mode 100644 index 04df14ea..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-bench.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz -mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-client.install b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-client.install deleted file mode 100644 index c6a27ce6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-client.install +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/innochecksum -usr/bin/myisam_ftdump -usr/bin/mysql -usr/bin/mysql_embedded -usr/bin/mysqlaccess -usr/bin/mysqlaccess.conf -usr/bin/mysqladmin -usr/bin/mysqlbug -usr/bin/mysqlcheck -usr/bin/mysql_client_test -usr/bin/mysql_client_test_embedded -usr/bin/mysqldump -usr/bin/mysqldumpslow -usr/bin/mysql_find_rows -usr/bin/mysql_fix_extensions -usr/bin/mysqlimport -usr/bin/mysql_plugin -usr/bin/mysqlshow -usr/bin/mysqlslap -usr/bin/mysql_waitpid -# man pages -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/myisam_ftdump.1 -usr/share/man/man1/mysql.1 -usr/share/man/man1/mysql_embedded.1 -usr/share/man/man1/mysqlaccess.1 -usr/share/man/man1/mysqladmin.1 -usr/share/man/man1/mysqlbug.1 -usr/share/man/man1/mysqlcheck.1 -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqldump.1 -usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 -usr/share/man/man1/mysqlimport.1 -usr/share/man/man1/mysqlman.1 -usr/share/man/man1/mysql_plugin.1 -usr/share/man/man1/mysqlshow.1 -usr/share/man/man1/mysqlslap.1 -usr/share/man/man1/mysql_waitpid.1 -# legal -usr/share/doc/mysql-community-client/COPYING -usr/share/doc/mysql-community-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-client.lintian-overrides deleted file mode 100644 index 58929356..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-client.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql -mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz -mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-client: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.config b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.config deleted file mode 100755 index cb6c39cf..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.config +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -if [ "$1" = "configure" ] && [ -z "$2" ]; -then - - set -e - - PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server - INSTALLED_PKG=none - MYSQLDATA=/var/lib/mysql - - IFS_BACKUP=${IFS} - IFS=":" - for PKG in ${PKG_LIST}; - do - STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4) - if [ "${STATUS}" = "installed" ]; - then - INSTALLED_PKG=${PKG} - break - fi - done - IFS=${IFS_BACKUP} - - if [ "${INSTALLED_PKG}" = "none" ]; - then - if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ]; - then - db_input high mysql-community-server/data-dir || true - else - db_fset mysql-community-server/data-dir seen true - fi - - while :; do - PASSWD="" - db_input high mysql-community-server/root-pass || true - db_go - - db_get mysql-community-server/root-pass - if [ -z "${RET}" ]; - then - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - break - fi - PASSWD="${RET}" - - db_input high mysql-community-server/re-root-pass || true - db_go - - db_get mysql-community-server/re-root-pass - if [ "${RET}" == "${PASSWD}" ]; - then - PASSWD="" - break - fi - - db_fset mysql-community-server/root-pass-mismatch seen false - db_input critical mysql-community-server/root-pass-mismatch - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - done - - else - db_fset mysql-community-server/data-dir seen true - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - fi - - set +e -fi diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.dirs b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.dirs deleted file mode 100644 index f677b6f3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.dirs +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d -etc/init.d -usr/lib/mysql -usr/lib/mysql/plugin diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.install b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.install deleted file mode 100644 index a1f5d053..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.install +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/msql2mysql -usr/bin/myisamchk -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/my_print_defaults -usr/bin/mysqlbinlog -usr/bin/mysql_convert_table_format -usr/bin/mysqld_multi -usr/bin/mysqld_safe -usr/bin/mysqlhotcopy -usr/bin/mysql_install_db -usr/bin/mysql_secure_installation -usr/bin/mysql_setpermission -usr/bin/mysqltest -usr/bin/mysqltest_embedded -usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_zap -usr/bin/perror -usr/bin/replace -usr/bin/resolveip -usr/bin/resolve_stack_dump -usr/sbin/mysqld -# debug binary -usr/sbin/mysqld-debug -# man pages -usr/share/man/man1/comp_err.1 -usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 -usr/share/man/man1/myisamlog.1 -usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql.server.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql-stress-test.pl.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man1/mysql_zap.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 -usr/share/man/man1/resolve_stack_dump.1 -usr/share/man/man8/mysqld.8 -# app armor profile -etc/apparmor.d/usr.sbin.mysqld -# SQL files -usr/share/mysql/*.sql -# plugins -usr/lib/mysql/plugin/*.so -usr/lib/mysql/plugin/debug/*.so -usr/lib/mysql/plugin/daemon_example.ini -usr/lib/mysql/plugin/debug/daemon_example.ini -# support files -usr/share/mysql/mysqld_multi.server -usr/share/mysql/magic -usr/share/mysql/mysql-log-rotate -usr/share/mysql/my-default.cnf -usr/share/mysql/dictionary.txt -# legal -usr/share/doc/mysql-community-server/COPYING -usr/share/doc/mysql-community-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.lintian-overrides deleted file mode 100644 index 08b38654..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.lintian-overrides +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz -mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-server: embedded-library -# Since we ship debug plugins so this error is overridden -mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/* diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.mysql.init b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.mysql.init deleted file mode 100755 index 475ce0fe..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.mysql.init +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $time -# Should-Stop: $network $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/ Stop MySQL Community Server daemon -# Description: This service script facilitates startup and shutdown of -# mysqld daemon throught its wrapper script mysqld_safe -### END INIT INFO -# - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /lib/lsb/init-functions - -cd / -umask 077 - -MYSQLDATA=/var/lib/mysql -VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4) - -get_mysql_option() { - RESULT=$(my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1) - if [ -z "$RESULT" ]; - then - RESULT="$3" - fi - echo $RESULT -} - -get_running () { - PIDFILE=$(get_mysql_option mysqld_safe pid-file "") - if [ -z "$PIDFILE" ]; - then - PIDFILE=$(get_mysql_option mysqld pid-file "$MYSQLDATA/$(hostname).pid") - fi - if [ -e "$PIDFILE" ] && [ -d "/proc/$(cat "$PIDFILE")" ]; - then - echo 1 - else - echo 0 - fi -} - -server_stop () { - RUNNING=$(get_running) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${RUNNING}" -eq 0 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - RUNNING=$(get_running) - sleep 1 - done - return 0 -} - -case "$1" in - 'start') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "A MySQL Server is already started" - else - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - /lib/init/apparmor-profile-load usr.sbin.mysqld - - su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &" - for i in 1 2 3 4 5 6; - do - sleep 1 - echo -n . - done - echo - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is started" - else - log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details." - fi - fi - ;; - - 'stop') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - killall -15 mysqld - server_stop - if [ "$?" -eq 0 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is stopped" - else - log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out" - fi - else - log_action_msg "MySQL Community Server ${VERSION} is already stopped" - fi - ;; - - 'restart'|'reload'|'force-reload') - log_action_msg "Stopping MySQL Community Server ${VERSION}" - $0 stop - log_action_msg "Re-starting MySQL Community Server ${VERSION}" - $0 start - ;; - - 'status') - RUNNING=$(get_running) - if [ ${RUNNING} -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is running" - else - log_action_msg "MySQL Community Server ${VERSION} is not running" - exit 3 - fi - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.postinst b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.postinst deleted file mode 100755 index 0fe3dc12..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.postinst +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -take_upstart_job_backup () { - if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ]; - then - mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup - fi -} - -case "$1" in - configure) - -# MySQL 5.6.34 needs this - MYSQLFILES=/var/lib/mysql-files - if [ ! -d ${MYSQLFILES} -a ! -L ${MYSQLFILES} ]; - then - mkdir ${MYSQLFILES} - chown mysql:mysql ${MYSQLFILES} - chmod 770 ${MYSQLFILES} - fi - - if [ -z "$2" ]; - then - set -e - - MYSQLDATA=/var/lib/mysql - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - fi - - db_get mysql-community-server/root-pass && PASSWD=${RET} - if [ ! -z "${PASSWD}" ]; - then - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';" - else - PASSWD="" - fi - - SQL=`mktemp` - if [ -f "${SQL}" ]; - then - chmod 700 ${SQL} - cat << EOF > ${SQL} -USE mysql; -${PASSWD} -DELETE FROM user WHERE user=''; -FLUSH PRIVILEGES; -EOF - mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL - PASSWD="" - rm -f ${SQL} - fi - - set +e - - fi - - ;; - - abort-upgrade|abort-remove|abort-configure) - - ;; - - *) - exit 1 - ;; -esac - -db_stop - -take_upstart_job_backup - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.postrm b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.postrm deleted file mode 100755 index 55f83a3b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.postrm +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; -then -. /usr/share/debconf/confmodule -fi - -place_upstart_job_back () { - if [ -e "/var/lib/mysql/.mysql.conf.backup" ]; - then - mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf - fi -} - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - remove) - - set -e - - place_upstart_job_back - - set +e - - ;; - - purge) - - set -e - - place_upstart_job_back - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - MYSQLFILES=/var/lib/mysql-files - - server_stop - - db_input high mysql-community-server/remove-data-dir || true - db_go - db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET} - if [ "${RMDATADIR}" = "true" ]; - then - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if [ -d ${MYSQLFILES} ] || [ -L ${MYSQLFILES} ]; - then - rm -rf ${MYSQLFILES} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - abort-install) - - set -e - - place_upstart_job_back - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql start || exit $? - else - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if [ -d ${MYSQLFILES} ] || [ -L ${MYSQLFILES} ]; - then - rm -rf ${MYSQLFILES} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - upgrade|abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.preinst b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.preinst deleted file mode 100755 index e5b3b771..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.preinst +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - install) - - if [ -z "$2" ]; - then - - set -e - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql stop || exit $? - server_stop - fi - - MYSQLDATA=/var/lib/mysql - MYSQLFILES=/var/lib/mysql-files - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - if ! getent group mysql >/dev/null; - then - addgroup --system mysql >/dev/null - fi - - if ! getent passwd mysql >/dev/null; - then - adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null - fi - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d ${MYSQLFILES} -a ! -L ${MYSQLFILES} ]; - then - mkdir ${MYSQLFILES} - chown mysql:mysql ${MYSQLFILES} - chmod 770 ${MYSQLFILES} - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - set +e - - fi - - ;; - - upgrade) - - set -e - - #DEBHELPER# - server_stop - - set +e - - ;; - - abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.prerm b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.prerm deleted file mode 100755 index 7509de7a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.prerm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -#DEBHELPER# - -set +e - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.templates b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.templates deleted file mode 100644 index 2469d917..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-server.templates +++ /dev/null @@ -1,34 +0,0 @@ -Template: mysql-community-server/root-pass -Type: password -Description: Enter root password: - Please provide a strong password that will be set for the root account of your MySQL database. - Leave it blank if you do not wish to set or change the root password at this time. - -Template: mysql-community-server/re-root-pass -Type: password -Description: Re-enter root password: - Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone. - -Template: mysql-community-server/root-pass-mismatch -Type: error -Description: The two passwords did not match - Please try again. Make sure you type the exact same password twice. - -Template: mysql-community-server/remove-data-dir -Type: boolean -Default: false -Description: Remove data directory at /var/lib/mysql ? - This operation will remove the data directory that stores all the databases, tables and related meta-data. - Additionally, any import or export files stored at '/var/lib/mysql-files' will be removed along with directory. - It is highly recommended to take data backup before removing the data directory. - -Template: mysql-community-server/data-dir -Type: note -Description: Data directory found when no MySQL server package is installed - A data directory '/var/lib/mysql' is present on this system when no MySQL server - package is currently installed on the system. The directory may be under control of - server package received from third-party vendors. It may also be an unclaimed data - directory from previous removal of mysql packages. - . - It is highly recommended to take data backup. If you have not done so, now would be - the time to take backup in another shell. Once completed, press 'Ok' to continue. diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-source.install b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-source.install deleted file mode 100644 index 326c5dfb..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-source.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -../*.dsc usr/src/mysql/ -../*.tar.gz usr/src/mysql/ -# legal -usr/share/doc/mysql-community-source/COPYING -usr/share/doc/mysql-community-source/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-source.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-source.lintian-overrides deleted file mode 100644 index 9ca84e90..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-source.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz -mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-test.install b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-test.install deleted file mode 100644 index d5f820dd..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-test.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/* -usr/share/man/man1/mysql-test-run.pl.1 -# legal -usr/share/doc/mysql-community-test/COPYING -usr/share/doc/mysql-community-test/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-test.links b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-test.links deleted file mode 100644 index aedf2db3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-test.links +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-test.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-test.lintian-overrides deleted file mode 100644 index ff273bbe..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-community-test.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz -mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-server.install b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-server.install deleted file mode 100644 index 07f36ef5..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-server.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-server/COPYING -usr/share/doc/mysql-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-server.lintian-overrides deleted file mode 100644 index 48770976..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-server.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql -mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz -mysql-server: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-testsuite.install b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-testsuite.install deleted file mode 100644 index 6a6e5f50..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-testsuite.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-testsuite/COPYING -usr/share/doc/mysql-testsuite/README diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-testsuite.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-trusty/mysql-testsuite.lintian-overrides deleted file mode 100644 index 37488fe6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/mysql-testsuite.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz -mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/patches/fix-man-page-links.patch b/mysql-wsrep-5.6/packaging/deb-trusty/patches/fix-man-page-links.patch deleted file mode 100644 index 004ccdf7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/patches/fix-man-page-links.patch +++ /dev/null @@ -1,14 +0,0 @@ -From: Akhil Mohan -Description: Fix path in man page link. -Bug: http://bugs.mysql.com/bug.php?id=70952 - ---- a/man/mysql_client_test_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysql_client_test_embedded.1 2013-11-14 19:29:56.768315219 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysql_client_test.1 -+.so man1/mysql_client_test.1 ---- a/man/mysqltest_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysqltest_embedded.1 2013-11-14 19:31:19.079280675 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysqltest.1 -+.so man1/mysqltest.1 diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/patches/fix-mtr-search-paths.patch b/mysql-wsrep-5.6/packaging/deb-trusty/patches/fix-mtr-search-paths.patch deleted file mode 100644 index 8a27a091..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/patches/fix-mtr-search-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -From: Akhil Mohan -Description: Adding extra search path for testsuite. - ---- a/mysql-test/lib/mtr_cases.pm 2014-02-24 13:14:37 +0530 -+++ b/mysql-test/lib/mtr_cases.pm 2014-07-02 11:46:24 +0530 -@@ -288,6 +288,7 @@ - { - $suitedir= my_find_dir($::basedir, - ["share/mysql-test/suite", -+ "lib/mysql-test/suite", - "mysql-test/suite", - "internal/mysql-test/suite", - "mysql-test", diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/patches/fix-mysql_install_db.patch b/mysql-wsrep-5.6/packaging/deb-trusty/patches/fix-mysql_install_db.patch deleted file mode 100644 index 41311b2c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/patches/fix-mysql_install_db.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Terje Røsten -Description: Maintains the pending --skip-my-cnf option in mainline -Bug: - -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 440a977..7d068fc 100644 ---- a/scripts/mysql_install_db.pl.in -+++ b/scripts/mysql_install_db.pl.in -@@ -113,6 +113,7 @@ EOF2 - print <{srcdir} and $opt->{basedir} ) - { - error($opt,"Specify either --basedir or --srcdir, not both"); - } --if ( $opt->{'keep-my-cnf'} ) -+if ( $opt->{rpm} || $opt->{'keep-my-cnf'} ) - { - $keep_my_cnf = 1; - } -@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ ) - } - - # ---------------------------------------------------------------------- --# Create database directories mysql & test -+# Create database directory mysql - # ---------------------------------------------------------------------- - - # FIXME The shell variant uses "mkdir -p": -@@ -697,7 +698,7 @@ if ($opt_user) - } - } - --foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" ) -+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql") - { - mkdir($dir, 0700) unless -d $dir; - if ($opt_user and -w "/") diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/patches/series b/mysql-wsrep-5.6/packaging/deb-trusty/patches/series deleted file mode 100644 index 31af2dc7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/patches/series +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#fix-man-page-links.patch -fix-mysql_install_db.patch -fix-mtr-search-paths.patch diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/rules b/mysql-wsrep-5.6/packaging/deb-trusty/rules deleted file mode 100755 index 8e4ab949..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/rules +++ /dev/null @@ -1,135 +0,0 @@ -#!/usr/bin/make -f - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -%: - dh $@ - -export DH_VERBOSE=1 -export CFLAGS= -export CXXFLAGS= - -override_dh_auto_configure: - @echo "RULES.$@" - cmake . \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_MYSQLTESTDIR=lib/mysql-test \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=lib/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DWITH_SSL=bundled \ - -DWITH_ZLIB=system \ - -DWITH_EXTRA_CHARSETS=all \ - -DWITH_INNODB_MEMCACHED=1 \ - -DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \ - -DINSTALL_LAYOUT=DEB - - cat CMakeCache.txt - touch $@ - -override_dh_auto_build: - @echo "RULES.$@" - $(MAKE) -j8 VERBOSE=1 - touch $@ - -override_dh_auto_test: - @echo "RULES.$@" - echo "No tests run because test 9: pfs_connect_attr is failing unreasonably" - touch $@ - -override_dh_auto_install: - - @echo "RULES.$@" - # complete install first - $(MAKE) install DESTDIR=debian/tmp - # remove all redundant files and links - rm debian/tmp/usr/lib/*/*_r* - rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake - rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake - rm debian/tmp/usr/lib/mysql-test/Makefile - # add missing man pages - install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1 - # add MySQL Server configuration file my.cnf to mysql-common package - install -g root -o root -m 0644 -D debian/extra/my.cnf debian/tmp/etc/mysql/my.cnf - # add MySQL Server debug binary and library to package - install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug - install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a - # add debug plugin libraries to package - install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug - for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done - install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug - install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug - # add apparmor profile - install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld - # add directory for legal docs - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18 - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source - # add COPYING file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING - # add README file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README - touch $@ - -override_dh_installinit: - @echo "RULES.$@" - dh_apparmor -pmysql-community-server --profile-name=usr.sbin.mysqld - dh_installinit --name=mysql -- defaults 19 21 - touch $@ diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/source/format b/mysql-wsrep-5.6/packaging/deb-trusty/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/source/include-binaries b/mysql-wsrep-5.6/packaging/deb-trusty/source/include-binaries deleted file mode 100644 index adb5f54b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/source/include-binaries +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins -debian/extra/server-binary -debian/extra/embedded-server -debian/extra/adt_null-plugin -debian/extra/auth-plugin -debian/extra/auth_socket-plugin -debian/extra/auth_test_plugin-plugin -debian/extra/innodb_engine-plugin -debian/extra/libdaemon_example-plugin -debian/extra/libmemcached-plugin -debian/extra/mypluglib-plugin -debian/extra/mysql_no_login-plugin -debian/extra/qa_auth_client-plugin -debian/extra/qa_auth_interface-plugin -debian/extra/qa_auth_server-plugin -debian/extra/semisync_master-plugin -debian/extra/semisync_slave-plugin -debian/extra/test_udf_services-plugin -debian/extra/validate_password-plugin -debian/extra/connection_control-plugin diff --git a/mysql-wsrep-5.6/packaging/deb-trusty/watch b/mysql-wsrep-5.6/packaging/deb-trusty/watch deleted file mode 100644 index c45c5e3e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-trusty/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/changelog b/mysql-wsrep-5.6/packaging/deb-utopic/changelog deleted file mode 100644 index 6c391b44..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/changelog +++ /dev/null @@ -1,96 +0,0 @@ -mysql-community (5.6.25-1ubuntu14.10) utopic; urgency=low - - * new upstream release - * mysql-community-server now depends on perl, psmisc - mysql-community-test now depends on python, libmysqlclient-dev - (Closes: #20561621) - - -- Akhil Mohan Wed, 25 Feb 2014 22:52:19 +0530 - -mysql-community (5.6.24-1ubuntu14.10) utopic; urgency=low - - * new upstream release - - -- Akhil Mohan Mon, 16 Feb 2014 15:45:09 +0530 - -mysql-community (5.6.23-1ubuntu14.10) utopic; urgency=low - - * new upstream release - * mysql-community-server now recommends mysql-client - * mysql-community-server now depends on apparmor - * removed template install-test-db; not installed by default - * d/compat incremented to 9 from 8 - * d/control updated to build depend on debhelper 9 - * added d/*.lintian-overrides and d/source/lintian-overrides - * d/rules updated to reflect correct file permissions - - -- Akhil Mohan Wed, 31 Dec 2014 10:51:07 +0530 - -mysql-community (5.6.22-2ubuntu14.10) utopic; urgency=low - - * new upstream release - * mysql-common now replaces mysql-server-{,core-}5.6 - - -- Akhil Mohan Wed, 28 Nov 2014 15:18:07 +0530 - -mysql-community (5.6.22-1ubuntu14.10) utopic; urgency=low - - * new upstream release - * fixed d/*server.postinst to allow dropping test db without - setting root password - * init script will now run my_i_db if data dir is not present or empty - * updated init script to read app armor profile on startup - * forked packaging source from trusty and rebranded for utopic - * updated d/m-c-source.install to pack *.xz packaging source archive - * added more system resources to app armor profile - * dh_apparmor to now run before dh_installinit in d/rules - * libmysqlclient-dev now replaces mysql-client-{,core-}5.6 - - -- Akhil Mohan Wed, 05 Nov 2014 17:04:07 +0530 - -mysql-community (5.6.21-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * updated d/rules to increment -j8 as make option - * updated d/source/include-binaries to add mysql_no_login plugin - * updated CMake option WITH_EXTRA_CHARSETS from complex to all - - -- Akhil Mohan Wed, 20 Aug 2014 19:12:30 +0530 - -mysql-community (5.6.20-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * added fakeroot as build-dep in d/control - * added d/*.dirs for bench, dev and test pkg - * updated d/rules to make compilation verbose - * removed default CFLAGS, CXXFLAGS in d/rules - * added patch for testsuite search paths under d/patches - * modified cmake option for testsuite in d/rules - * updated patch d/fix-mysql_install_db.patch - * enabled two patches in d/patches/series - * removed extra permissions check in d/rules when fixed in source - * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf - * modified d/*-test.* for updated location of testsuite - * updated d/{mysql-*-server.install,rules} to include debug plugins - * updated d/rules to remove storage engine cmake options - * modified data dir permission in d/*server.{pre,post}inst - * updated d/source/include-binaries to add debug plugins - * updated d/rules to rename debug plugins - - -- Akhil Mohan Wed, 02 Jul 2014 17:45:30 +0530 - -mysql-community (5.6.19-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * d/rules updated to rid of files removed from source - * modified path for source tar in source pkg - * obscured actual filenames in d/source/include-binaries - * modified d/rules to handle obscured filenames - - -- Akhil Mohan Mon, 05 May 2014 15:45:10 +0530 - -mysql-community (5.6.17-1ubuntu14.04) trusty; urgency=low - - * new upstream release - - -- Akhil Mohan Fri, 28 Feb 2014 18:06:30 +0530 diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/compat b/mysql-wsrep-5.6/packaging/deb-utopic/compat deleted file mode 100644 index ec635144..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/control b/mysql-wsrep-5.6/packaging/deb-utopic/control deleted file mode 100644 index e04d7531..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/control +++ /dev/null @@ -1,190 +0,0 @@ -Source: mysql-community -Maintainer: MySQL Release Engineering -Section: database -Priority: optional -Standards-Version: 3.9.5 -Homepage: http://www.mysql.com/ -Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, lsb-release, cmake, fakeroot, libnuma-dev - -Package: mysql-server -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends} -Description: MySQL Server meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql server - package available in the repository. - -Package: mysql-community-server -Architecture: any -Pre-depends: debconf (>= 0.2.17), adduser -Depends: mysql-common (= ${binary:Version}), apparmor, perl, psmisc, - ${shlibs:Depends}, ${misc:Depends} -Recommends: mysql-client (= ${binary:Version}) -Conflicts: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Replaces: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Provides: virtual-mysql-server, virtual-mysql-server-core, - mysql-server-5.6, mysql-server-core-5.6 -Description: MySQL Server - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package includes the MySQL server binary as well as related - utilities to run and administer a MySQL server. - -Package: mysql-client -Architecture: any -Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends} -Description: MySQL Client meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql client - package available in the repository. - -Package: mysql-community-client -Architecture: any -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Replaces: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Provides: virtual-mysql-client, virtual-mysql-client-core, - mysql-client-5.6, mysql-client-core-5.6 -Description: MySQL Client - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the standard MySQL clients and - administration tools. - -Package: libmysqlclient18 -Architecture: any -Section: libs -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL shared client libraries - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the shared libraries for MySQL client - applications. - -Package: mysql-common -Architecture: any -Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends} -Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql -Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev, - mysql-server-5.6, mysql-server-core-5.6 -Provides: mysql-common -Description: MySQL Common - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains common files needed by MySQL client - library, MySQL database server, and MySQL embedded server. - -Package: libmysqlclient-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient18 (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Replaces: mysql-client-5.6, mysql-client-core-5.6 -Description: MySQL development headers - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the development header files necessary - to develop MySQL client applications. - -Package: libmysqld-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient-dev (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL embedded server library - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL server as an embedded library. - -Package: mysql-testsuite -Architecture: any -Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends} -Description: MySQL Testsuite meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql test - package available in the repository. - -Package: mysql-community-test -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - mysql-community-client (= ${binary:Version}), python, - libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5, - mysql-testsuite-5.6, mysql-commercial-test -Description: MySQL Test Run MTR - The MySQL testsuite - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL regression test suite for MySQL - database server. - -Package: mysql-community-bench -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-commercial-bench -Description: MySQL Bench - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. - -Package: mysql-community-source -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: MySQL source - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/copyright b/mysql-wsrep-5.6/packaging/deb-utopic/copyright deleted file mode 100644 index 2c31f240..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/copyright +++ /dev/null @@ -1,41 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: MySQL Server 5.6 -Upstream-Contact: MySQL Release Engineering -Source: http://dev.mysql.com/ - -Copyright: 2000, 2014, 2015, Oracle and/or its affiliates. All rights reserved. -License: - This is a release of MySQL, a dual-license SQL database server. - For the avoidance of doubt, this particular copy of the software - is released under the version 2 of the GNU General Public License. - MySQL is brought to you by Oracle. - . - MySQL FOSS License Exception - We want free and open source software applications under certain - licenses to be able to use specified GPL-licensed MySQL client - libraries despite the fact that not all such FOSS licenses are - compatible with version 2 of the GNU General Public License. - Therefore there are special exceptions to the terms and conditions - of the GPLv2 as applied to these client libraries, which are - identified and described in more detail in the FOSS License - Exception at - . - . - This distribution may include materials developed by third - parties. For license and attribution notices for these - materials, please refer to the documentation that accompanies - this distribution (see the "Licenses for Third-Party Components" - appendix) or view the online documentation at - . - . - GPLv2 Disclaimer - For the avoidance of doubt, except that if any license choice - other than GPL or LGPL is available it will apply instead, - Oracle elects to use only the General Public License version 2 - (GPLv2) at this time for any software where a choice of GPL - license versions is made available with the language indicating - that GPLv2 or any later version may be used, or where a choice - . - The full text of the GNU General Public License version 2 can - be found in the file - `/usr/share/mysql/doc/COPYING'. diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/extra/apparmor-profile b/mysql-wsrep-5.6/packaging/deb-utopic/extra/apparmor-profile deleted file mode 100644 index 5370d9e4..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/extra/apparmor-profile +++ /dev/null @@ -1,49 +0,0 @@ -# vim:syntax=apparmor -# Last Modified: Fri Feb 28 18:06:30 2014 -#include - -/usr/sbin/mysqld { - #include - #include - #include - -# Allow system resource access - /sys/devices/system/cpu/ r, - capability sys_resource, - capability dac_override, - capability setuid, - capability setgid, - -# Allow config access - /etc/mysql/conf.d/ r, - /etc/mysql/conf.d/*.cnf r, - /etc/mysql/*.cnf r, - -# Allow pid and socket file access - /run/mysqld/mysqld.pid rw, - /run/mysqld/mysqld.sock rw, - -# Allow read/ write to /tmp - /tmp/ r, - /tmp/* rw, - -# Allow execution of server binary - /usr/sbin/mysqld mr, - /usr/sbin/mysqld-debug mr, - -# Allow plugin access - /usr/lib/mysql/plugin/ r, - /usr/lib/mysql/plugin/*.so* mr, - -# Allow error msg and charset access - /usr/share/mysql/ r, - /usr/share/mysql/** r, - -# Allow data dir access - /var/lib/mysql/ r, - /var/lib/mysql/** rwk, - -# Allow log file access - /var/log/mysql/ r, - /var/log/mysql/** rw, -} diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/extra/my.cnf b/mysql-wsrep-5.6/packaging/deb-utopic/extra/my.cnf deleted file mode 100644 index 3a5445fa..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/extra/my.cnf +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Community Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[client] -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[mysqld_safe] -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -explicit_defaults_for_timestamp - -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 - -log-error = /var/log/mysql/error.log - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/extra/mysql_embedded.1 b/mysql-wsrep-5.6/packaging/deb-utopic/extra/mysql_embedded.1 deleted file mode 100644 index 735c4e05..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/extra/mysql_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysql.1 diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient-dev.install b/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient-dev.install deleted file mode 100644 index e7e98c15..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient-dev.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql/*.h -usr/include/mysql/mysql/*.h -usr/include/mysql/mysql/*.h.pp -usr/include/mysql/mysql/psi/*.h -usr/lib/*/libmysqlclient.a -usr/lib/*/libmysqlclient.so -usr/lib/*/libmysqlservices.a -usr/bin/mysql_config -usr/bin/mysql_config_editor -usr/share/man/man1/mysql_config.1 -usr/share/man/man1/mysql_config_editor.1 -# legal -usr/share/doc/libmysqlclient-dev/COPYING -usr/share/doc/libmysqlclient-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient-dev.lintian-overrides deleted file mode 100644 index 09960eb2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient-dev.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz -libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient-dev: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient18.install b/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient18.install deleted file mode 100644 index fe6aa56c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient18.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqlclient.so.* -# legal -usr/share/doc/libmysqlclient18/COPYING -usr/share/doc/libmysqlclient18/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient18.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient18.lintian-overrides deleted file mode 100644 index 1f26511a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqlclient18.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz -libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient18: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqld-dev.install b/mysql-wsrep-5.6/packaging/deb-utopic/libmysqld-dev.install deleted file mode 100644 index 923f826a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqld-dev.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqld.a -usr/lib/*/libmysqld-debug.a -# legal -usr/share/doc/libmysqld-dev/COPYING -usr/share/doc/libmysqld-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqld-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/libmysqld-dev.lintian-overrides deleted file mode 100644 index 35caaeca..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/libmysqld-dev.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz -libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-client.install b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-client.install deleted file mode 100644 index 13b877e7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-client.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-client/COPYING -usr/share/doc/mysql-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-client.lintian-overrides deleted file mode 100644 index 5c4891c9..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-client.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql -mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz -mysql-client: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-common.dirs b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-common.dirs deleted file mode 100644 index 69265ef0..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-common.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-common.install b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-common.install deleted file mode 100644 index 8a22acd4..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-common.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/my.cnf -usr/share/aclocal/mysql.m4 -usr/share/mysql/docs/INFO_SRC -usr/share/mysql/docs/INFO_BIN -usr/share/mysql/docs/ChangeLog -# localized error msgs -usr/share/mysql/*/errmsg.sys -usr/share/mysql/errmsg-utf8.txt -# charsets -usr/share/mysql/charsets/*.xml -usr/share/mysql/charsets/README -# legal -usr/share/doc/mysql-common/COPYING -usr/share/doc/mysql-common/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-common.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-common.lintian-overrides deleted file mode 100644 index 70ddcdf6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-common.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql -mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz -mysql-common: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-bench.install b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-bench.install deleted file mode 100644 index 065124bd..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-bench.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql/sql-bench/* -# legal -usr/share/doc/mysql-community-bench/COPYING -usr/share/doc/mysql-community-bench/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-bench.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-bench.lintian-overrides deleted file mode 100644 index 04df14ea..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-bench.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz -mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-client.install b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-client.install deleted file mode 100644 index 46cd07d4..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-client.install +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/innochecksum -usr/bin/myisam_ftdump -usr/bin/mysql -usr/bin/mysql_embedded -usr/bin/mysqlaccess -usr/bin/mysqlaccess.conf -usr/bin/mysqladmin -usr/bin/mysqlbug -usr/bin/mysqlcheck -usr/bin/mysql_client_test -usr/bin/mysql_client_test_embedded -usr/bin/mysqldump -usr/bin/mysqldumpslow -usr/bin/mysql_find_rows -usr/bin/mysql_fix_extensions -usr/bin/mysqlimport -usr/bin/mysql_plugin -usr/bin/mysqlshow -usr/bin/mysqlslap -usr/bin/mysql_waitpid -# man pages -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/myisam_ftdump.1 -usr/share/man/man1/mysql.1 -usr/share/man/man1/mysql_embedded.1 -usr/share/man/man1/mysqlaccess.1 -usr/share/man/man1/mysqladmin.1 -usr/share/man/man1/mysqlbug.1 -usr/share/man/man1/mysqlcheck.1 -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqldump.1 -usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 -usr/share/man/man1/mysqlimport.1 -usr/share/man/man1/mysqlman.1 -usr/share/man/man1/mysql_plugin.1 -usr/share/man/man1/mysqlshow.1 -usr/share/man/man1/mysqlslap.1 -usr/share/man/man1/mysql_waitpid.1 -# legal -usr/share/doc/mysql-community-client/COPYING -usr/share/doc/mysql-community-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-client.lintian-overrides deleted file mode 100644 index 58929356..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-client.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql -mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz -mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-client: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.config b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.config deleted file mode 100755 index ceb33733..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.config +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -if [ "$1" = "configure" ] && [ -z "$2" ]; -then - - set -e - - PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server - INSTALLED_PKG=none - MYSQLDATA=/var/lib/mysql - - IFS_BACKUP=${IFS} - IFS=":" - for PKG in ${PKG_LIST}; - do - STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4) - if [ "${STATUS}" = "installed" ]; - then - INSTALLED_PKG=${PKG} - break - fi - done - IFS=${IFS_BACKUP} - - if [ "${INSTALLED_PKG}" = "none" ]; - then - if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ]; - then - db_input high mysql-community-server/data-dir || true - else - db_fset mysql-community-server/data-dir seen true - fi - - while :; do - PASSWD="" - db_input high mysql-community-server/root-pass || true - db_go - - db_get mysql-community-server/root-pass - if [ -z "${RET}" ]; - then - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - break - fi - PASSWD="${RET}" - - db_input high mysql-community-server/re-root-pass || true - db_go - - db_get mysql-community-server/re-root-pass - if [ "${RET}" == "${PASSWD}" ]; - then - PASSWD="" - break - fi - - db_fset mysql-community-server/root-pass-mismatch seen false - db_input critical mysql-community-server/root-pass-mismatch - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - done - - else - db_fset mysql-community-server/data-dir seen true - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - fi - - set +e -fi diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.dirs b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.dirs deleted file mode 100644 index 91e71855..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.dirs +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d -etc/init.d -usr/lib/mysql -usr/lib/mysql/plugin diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.install b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.install deleted file mode 100644 index 589ea209..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.install +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/msql2mysql -usr/bin/myisamchk -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/my_print_defaults -usr/bin/mysqlbinlog -usr/bin/mysql_convert_table_format -usr/bin/mysqld_multi -usr/bin/mysqld_safe -usr/bin/mysqlhotcopy -usr/bin/mysql_install_db -usr/bin/mysql_secure_installation -usr/bin/mysql_setpermission -usr/bin/mysqltest -usr/bin/mysqltest_embedded -usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_zap -usr/bin/perror -usr/bin/replace -usr/bin/resolveip -usr/bin/resolve_stack_dump -usr/sbin/mysqld -# debug binary -usr/sbin/mysqld-debug -# man pages -usr/share/man/man1/comp_err.1 -usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 -usr/share/man/man1/myisamlog.1 -usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql.server.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql-stress-test.pl.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man1/mysql_zap.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 -usr/share/man/man1/resolve_stack_dump.1 -usr/share/man/man8/mysqld.8 -# app armor profile -etc/apparmor.d/usr.sbin.mysqld -# SQL files -usr/share/mysql/*.sql -# plugins -usr/lib/mysql/plugin/*.so -usr/lib/mysql/plugin/debug/*.so -usr/lib/mysql/plugin/daemon_example.ini -usr/lib/mysql/plugin/debug/daemon_example.ini -# support files -usr/share/mysql/mysqld_multi.server -usr/share/mysql/magic -usr/share/mysql/mysql-log-rotate -usr/share/mysql/my-default.cnf -usr/share/mysql/dictionary.txt -# legal -usr/share/doc/mysql-community-server/COPYING -usr/share/doc/mysql-community-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.lintian-overrides deleted file mode 100644 index 08b38654..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.lintian-overrides +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz -mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-server: embedded-library -# Since we ship debug plugins so this error is overridden -mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/* diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.mysql.init b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.mysql.init deleted file mode 100755 index 67a01932..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.mysql.init +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $time -# Should-Stop: $network $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/ Stop MySQL Community Server daemon -# Description: This service script facilitates startup and shutdown of -# mysqld daemon throught its wrapper script mysqld_safe -### END INIT INFO -# - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /lib/lsb/init-functions - -cd / -umask 077 - -MYSQLDATA=/var/lib/mysql -VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4) - -get_mysql_option() { - RESULT=$(my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1) - if [ -z "$RESULT" ]; - then - RESULT="$3" - fi - echo $RESULT -} - -get_running () { - PIDFILE=$(get_mysql_option mysqld_safe pid-file "") - if [ -z "$PIDFILE" ]; - then - PIDFILE=$(get_mysql_option mysqld pid-file "$MYSQLDATA/$(hostname).pid") - fi - if [ -e "$PIDFILE" ] && [ -d "/proc/$(cat "$PIDFILE")" ]; - then - echo 1 - else - echo 0 - fi -} - -server_stop () { - RUNNING=$(get_running) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${RUNNING}" -eq 0 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - RUNNING=$(get_running) - sleep 1 - done - return 0 -} - -case "$1" in - 'start') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "A MySQL Server is already started" - else - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - /lib/init/apparmor-profile-load usr.sbin.mysqld - - su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &" - for i in 1 2 3 4 5 6; - do - sleep 1 - echo -n . - done - echo - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is started" - else - log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details." - fi - fi - ;; - - 'stop') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - killall -15 mysqld - server_stop - if [ "$?" -eq 0 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is stopped" - else - log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out" - fi - else - log_action_msg "MySQL Community Server ${VERSION} is already stopped" - fi - ;; - - 'restart'|'reload'|'force-reload') - log_action_msg "Stopping MySQL Community Server ${VERSION}" - $0 stop - log_action_msg "Re-starting MySQL Community Server ${VERSION}" - $0 start - ;; - - 'status') - RUNNING=$(get_running) - if [ ${RUNNING} -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is running" - else - log_action_msg "MySQL Community Server ${VERSION} is not running" - exit 3 - fi - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.postinst b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.postinst deleted file mode 100755 index ee72a0f2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.postinst +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -take_upstart_job_backup () { - if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ]; - then - mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup - fi -} - -case "$1" in - configure) - - if [ -z "$2" ]; - then - set -e - - MYSQLDATA=/var/lib/mysql - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - fi - - db_get mysql-community-server/root-pass && PASSWD=${RET} - if [ ! -z "${PASSWD}" ]; - then - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';" - else - PASSWD="" - fi - - SQL=`mktemp` - if [ -f "${SQL}" ]; - then - chmod 700 ${SQL} - cat << EOF > ${SQL} -USE mysql; -${PASSWD} -DELETE FROM user WHERE user=''; -FLUSH PRIVILEGES; -EOF - mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL - PASSWD="" - rm -f ${SQL} - fi - - set +e - - fi - - ;; - - abort-upgrade|abort-remove|abort-configure) - - ;; - - *) - exit 1 - ;; -esac - -db_stop - -take_upstart_job_backup - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.postrm b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.postrm deleted file mode 100755 index efdaeeae..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.postrm +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; -then -. /usr/share/debconf/confmodule -fi - -place_upstart_job_back () { - if [ -e "/var/lib/mysql/.mysql.conf.backup" ]; - then - mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf - fi -} - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - remove) - - set -e - - place_upstart_job_back - - set +e - - ;; - - purge) - - set -e - - place_upstart_job_back - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - server_stop - - db_input high mysql-community-server/remove-data-dir || true - db_go - db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET} - if [ "${RMDATADIR}" = "true" ]; - then - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - abort-install) - - set -e - - place_upstart_job_back - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql start || exit $? - else - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - upgrade|abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.preinst b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.preinst deleted file mode 100755 index c769885e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.preinst +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - install) - - if [ -z "$2" ]; - then - - set -e - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql stop || exit $? - server_stop - fi - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - if ! getent group mysql >/dev/null; - then - addgroup --system mysql >/dev/null - fi - - if ! getent passwd mysql >/dev/null; - then - adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null - fi - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - set +e - - fi - - ;; - - upgrade) - - set -e - - #DEBHELPER# - server_stop - - set +e - - ;; - - abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.prerm b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.prerm deleted file mode 100755 index 1386b5d4..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.prerm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -#DEBHELPER# - -set +e - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.templates b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.templates deleted file mode 100644 index 7b7e0ac3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-server.templates +++ /dev/null @@ -1,33 +0,0 @@ -Template: mysql-community-server/root-pass -Type: password -Description: Enter root password: - Please provide a strong password that will be set for the root account of your MySQL database. - Leave it blank if you do not wish to set or change the root password at this time. - -Template: mysql-community-server/re-root-pass -Type: password -Description: Re-enter root password: - Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone. - -Template: mysql-community-server/root-pass-mismatch -Type: error -Description: The two passwords did not match - Please try again. Make sure you type the exact same password twice. - -Template: mysql-community-server/remove-data-dir -Type: boolean -Default: false -Description: Remove data directory at /var/lib/mysql ? - This operation will remove the data directory that stores all the databases, tables and related meta-data. - It is highly recommended to take data backup before removing the data directory. - -Template: mysql-community-server/data-dir -Type: note -Description: Data directory found when no MySQL server package is installed - A data directory '/var/lib/mysql' is present on this system when no MySQL server - package is currently installed on the system. The directory may be under control of - server package received from third-party vendors. It may also be an unclaimed data - directory from previous removal of mysql packages. - . - It is highly recommended to take data backup. If you have not done so, now would be - the time to take backup in another shell. Once completed, press 'Ok' to continue. diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-source.install b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-source.install deleted file mode 100644 index 46a0f12b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-source.install +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -../*.dsc usr/src/mysql/ -../*.tar.gz usr/src/mysql/ -../*.tar.xz usr/src/mysql/ -# legal -usr/share/doc/mysql-community-source/COPYING -usr/share/doc/mysql-community-source/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-source.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-source.lintian-overrides deleted file mode 100644 index 9ca84e90..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-source.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz -mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-test.install b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-test.install deleted file mode 100644 index e70086b3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-test.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/* -usr/share/man/man1/mysql-test-run.pl.1 -# legal -usr/share/doc/mysql-community-test/COPYING -usr/share/doc/mysql-community-test/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-test.links b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-test.links deleted file mode 100644 index bf66c98b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-test.links +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-test.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-test.lintian-overrides deleted file mode 100644 index ff273bbe..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-community-test.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz -mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-server.install b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-server.install deleted file mode 100644 index e3aa8de2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-server.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-server/COPYING -usr/share/doc/mysql-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-server.lintian-overrides deleted file mode 100644 index 48770976..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-server.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql -mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz -mysql-server: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-testsuite.install b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-testsuite.install deleted file mode 100644 index dfc17333..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-testsuite.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-testsuite/COPYING -usr/share/doc/mysql-testsuite/README diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-testsuite.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-utopic/mysql-testsuite.lintian-overrides deleted file mode 100644 index 37488fe6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/mysql-testsuite.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz -mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/patches/fix-man-page-links.patch b/mysql-wsrep-5.6/packaging/deb-utopic/patches/fix-man-page-links.patch deleted file mode 100644 index 004ccdf7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/patches/fix-man-page-links.patch +++ /dev/null @@ -1,14 +0,0 @@ -From: Akhil Mohan -Description: Fix path in man page link. -Bug: http://bugs.mysql.com/bug.php?id=70952 - ---- a/man/mysql_client_test_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysql_client_test_embedded.1 2013-11-14 19:29:56.768315219 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysql_client_test.1 -+.so man1/mysql_client_test.1 ---- a/man/mysqltest_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysqltest_embedded.1 2013-11-14 19:31:19.079280675 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysqltest.1 -+.so man1/mysqltest.1 diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/patches/fix-mtr-search-paths.patch b/mysql-wsrep-5.6/packaging/deb-utopic/patches/fix-mtr-search-paths.patch deleted file mode 100644 index 8a27a091..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/patches/fix-mtr-search-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -From: Akhil Mohan -Description: Adding extra search path for testsuite. - ---- a/mysql-test/lib/mtr_cases.pm 2014-02-24 13:14:37 +0530 -+++ b/mysql-test/lib/mtr_cases.pm 2014-07-02 11:46:24 +0530 -@@ -288,6 +288,7 @@ - { - $suitedir= my_find_dir($::basedir, - ["share/mysql-test/suite", -+ "lib/mysql-test/suite", - "mysql-test/suite", - "internal/mysql-test/suite", - "mysql-test", diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/patches/fix-mysql_install_db.patch b/mysql-wsrep-5.6/packaging/deb-utopic/patches/fix-mysql_install_db.patch deleted file mode 100644 index 41311b2c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/patches/fix-mysql_install_db.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Terje Røsten -Description: Maintains the pending --skip-my-cnf option in mainline -Bug: - -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 440a977..7d068fc 100644 ---- a/scripts/mysql_install_db.pl.in -+++ b/scripts/mysql_install_db.pl.in -@@ -113,6 +113,7 @@ EOF2 - print <{srcdir} and $opt->{basedir} ) - { - error($opt,"Specify either --basedir or --srcdir, not both"); - } --if ( $opt->{'keep-my-cnf'} ) -+if ( $opt->{rpm} || $opt->{'keep-my-cnf'} ) - { - $keep_my_cnf = 1; - } -@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ ) - } - - # ---------------------------------------------------------------------- --# Create database directories mysql & test -+# Create database directory mysql - # ---------------------------------------------------------------------- - - # FIXME The shell variant uses "mkdir -p": -@@ -697,7 +698,7 @@ if ($opt_user) - } - } - --foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" ) -+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql") - { - mkdir($dir, 0700) unless -d $dir; - if ($opt_user and -w "/") diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/patches/series b/mysql-wsrep-5.6/packaging/deb-utopic/patches/series deleted file mode 100644 index e3b20d6f..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/patches/series +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#fix-man-page-links.patch -fix-mysql_install_db.patch -fix-mtr-search-paths.patch diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/rules b/mysql-wsrep-5.6/packaging/deb-utopic/rules deleted file mode 100755 index 8ffd861a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/rules +++ /dev/null @@ -1,135 +0,0 @@ -#!/usr/bin/make -f - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -%: - dh $@ - -export DH_VERBOSE=1 -export CFLAGS= -export CXXFLAGS= - -override_dh_auto_configure: - @echo "RULES.$@" - cmake . \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_MYSQLTESTDIR=lib/mysql-test \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=lib/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DWITH_SSL=bundled \ - -DWITH_ZLIB=system \ - -DWITH_EXTRA_CHARSETS=all \ - -DWITH_INNODB_MEMCACHED=1 \ - -DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \ - -DINSTALL_LAYOUT=DEB - - cat CMakeCache.txt - touch $@ - -override_dh_auto_build: - @echo "RULES.$@" - $(MAKE) -j8 VERBOSE=1 - touch $@ - -override_dh_auto_test: - @echo "RULES.$@" - echo "No tests run because test 9: pfs_connect_attr is failing unreasonably" - touch $@ - -override_dh_auto_install: - - @echo "RULES.$@" - # complete install first - $(MAKE) install DESTDIR=debian/tmp - # remove all redundant files and links - rm debian/tmp/usr/lib/*/*_r* - rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake - rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake - rm debian/tmp/usr/lib/mysql-test/Makefile - # add missing man pages - install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1 - # add MySQL Server configuration file my.cnf to mysql-common package - install -g root -o root -m 0644 -D debian/extra/my.cnf debian/tmp/etc/mysql/my.cnf - # add MySQL Server debug binary and library to package - install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug - install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a - # add debug plugin libraries to package - install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug - for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done - install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug - install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug - # add apparmor profile - install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld - # add directory for legal docs - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18 - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source - # add COPYING file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING - # add README file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README - touch $@ - -override_dh_installinit: - @echo "RULES.$@" - dh_apparmor -pmysql-community-server --profile-name=usr.sbin.mysqld - dh_installinit --name=mysql -- defaults 19 21 - touch $@ diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/source/format b/mysql-wsrep-5.6/packaging/deb-utopic/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/source/include-binaries b/mysql-wsrep-5.6/packaging/deb-utopic/source/include-binaries deleted file mode 100644 index 0c23142f..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/source/include-binaries +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins -debian/extra/server-binary -debian/extra/embedded-server -debian/extra/adt_null-plugin -debian/extra/auth-plugin -debian/extra/auth_socket-plugin -debian/extra/auth_test_plugin-plugin -debian/extra/innodb_engine-plugin -debian/extra/libdaemon_example-plugin -debian/extra/libmemcached-plugin -debian/extra/mypluglib-plugin -debian/extra/mysql_no_login-plugin -debian/extra/qa_auth_client-plugin -debian/extra/qa_auth_interface-plugin -debian/extra/qa_auth_server-plugin -debian/extra/semisync_master-plugin -debian/extra/semisync_slave-plugin -debian/extra/test_udf_services-plugin -debian/extra/validate_password-plugin diff --git a/mysql-wsrep-5.6/packaging/deb-utopic/watch b/mysql-wsrep-5.6/packaging/deb-utopic/watch deleted file mode 100644 index c45c5e3e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-utopic/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/changelog b/mysql-wsrep-5.6/packaging/deb-vivid/changelog deleted file mode 100644 index 6651421f..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/changelog +++ /dev/null @@ -1,131 +0,0 @@ -mysql-community (5.6.26-1ubuntu15.04) vivid; urgency=low - - * new upstream release - * mysql-commercial-server now depends on perl, psmisc - mysql-commercial-test now depends on python, libmysqlclient-dev - (Closes: #20893836) - - -- Akhil Mohan Thu, 18 Jun 2015 16:34:10 +0530 - -mysql-community (5.6.25-3ubuntu15.04) vivid; urgency=low - - * new upstream release - * mysql-common now conflicts with - mysql-server-5.6, mysql-server-core-5.6 - mysql-client-5.6, mysql-client-core-5.6 - * mysql-*-server no more provides - mysql-server-5.6, mysql-server-core-5.6 - * mysql-*-client no more provides - mysql-client-5.6, mysql-client-core-5.6 - - -- Akhil Mohan Mon, 15 Jun 2015 16:48:05 +0530 - -mysql-community (5.6.24-3ubuntu15.04) vivid; urgency=low - - * updated Standards-Version to 3.9.6 in d/control - * apparmor profile updated to allow read on all files under /etc/mysql - * added new conf files under d/extra/*.conf - * mysql_plugin moved from client to server pkg - * innochecksum moved from client to server pkg - * server pkg now replaces client pkg - * added systemd service profile and script - * new /etc/mysql/my.cnf management scheme added for Ubuntu 15.04 - as discussed in Dec 2014 for native packaging source - * added dh "--with systemd" for enabling systemd - - -- Akhil Mohan Wed, 27 May 2015 11:35:35 +0530 - -mysql-community (5.6.24-2ubuntu15.04) vivid; urgency=low - - * new upstream release - * forked packaging source from utopic to vivid - - -- Akhil Mohan Wed, 15 Apr 2015 18:52:22 +0530 - -mysql-community (5.6.24-1ubuntu14.10) utopic; urgency=low - - * new upstream release - - -- Akhil Mohan Mon, 16 Feb 2014 15:45:09 +0530 - -mysql-community (5.6.23-1ubuntu14.10) utopic; urgency=low - - * new upstream release - * mysql-community-server now recommends mysql-client - * mysql-community-server now depends on apparmor - * removed template install-test-db; not installed by default - * d/compat incremented to 9 from 8 - * d/control updated to build depend on debhelper 9 - * added d/*.lintian-overrides and d/source/lintian-overrides - * d/rules updated to reflect correct file permissions - - -- Akhil Mohan Wed, 31 Dec 2014 10:51:07 +0530 - -mysql-community (5.6.22-2ubuntu14.10) utopic; urgency=low - - * new upstream release - * mysql-common now replaces mysql-server-{,core-}5.6 - - -- Akhil Mohan Wed, 28 Nov 2014 15:18:07 +0530 - -mysql-community (5.6.22-1ubuntu14.10) utopic; urgency=low - - * new upstream release - * fixed d/*server.postinst to allow dropping test db without - setting root password - * init script will now run my_i_db if data dir is not present or empty - * updated init script to read app armor profile on startup - * forked packaging source from trusty and rebranded for utopic - * updated d/m-c-source.install to pack *.xz packaging source archive - * added more system resources to app armor profile - * dh_apparmor to now run before dh_installinit in d/rules - * libmysqlclient-dev now replaces mysql-client-{,core-}5.6 - - -- Akhil Mohan Wed, 05 Nov 2014 17:04:07 +0530 - -mysql-community (5.6.21-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * updated d/rules to increment -j8 as make option - * updated d/source/include-binaries to add mysql_no_login plugin - * updated CMake option WITH_EXTRA_CHARSETS from complex to all - - -- Akhil Mohan Wed, 20 Aug 2014 19:12:30 +0530 - -mysql-community (5.6.20-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * added fakeroot as build-dep in d/control - * added d/*.dirs for bench, dev and test pkg - * updated d/rules to make compilation verbose - * removed default CFLAGS, CXXFLAGS in d/rules - * added patch for testsuite search paths under d/patches - * modified cmake option for testsuite in d/rules - * updated patch d/fix-mysql_install_db.patch - * enabled two patches in d/patches/series - * removed extra permissions check in d/rules when fixed in source - * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf - * modified d/*-test.* for updated location of testsuite - * updated d/{mysql-*-server.install,rules} to include debug plugins - * updated d/rules to remove storage engine cmake options - * modified data dir permission in d/*server.{pre,post}inst - * updated d/source/include-binaries to add debug plugins - * updated d/rules to rename debug plugins - - -- Akhil Mohan Wed, 02 Jul 2014 17:45:30 +0530 - -mysql-community (5.6.19-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * d/rules updated to rid of files removed from source - * modified path for source tar in source pkg - * obscured actual filenames in d/source/include-binaries - * modified d/rules to handle obscured filenames - - -- Akhil Mohan Mon, 05 May 2014 15:45:10 +0530 - -mysql-community (5.6.17-1ubuntu14.04) trusty; urgency=low - - * new upstream release - - -- Akhil Mohan Fri, 28 Feb 2014 18:06:30 +0530 diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/compat b/mysql-wsrep-5.6/packaging/deb-vivid/compat deleted file mode 100644 index ec635144..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/control b/mysql-wsrep-5.6/packaging/deb-vivid/control deleted file mode 100644 index 8bc5ecdf..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/control +++ /dev/null @@ -1,192 +0,0 @@ -Source: mysql-community -Maintainer: MySQL Release Engineering -Section: database -Priority: optional -Standards-Version: 3.9.6 -Homepage: http://www.mysql.com/ -Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, dh-systemd (>= 1.5), lsb-release, cmake, fakeroot, libnuma-dev - -Package: mysql-server -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends} -Description: MySQL Server meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql server - package available in the repository. - -Package: mysql-community-server -Architecture: any -Pre-depends: debconf (>= 0.2.17), adduser -Depends: mysql-common (= ${binary:Version}), apparmor, perl, psmisc, - ${shlibs:Depends}, ${misc:Depends} -Recommends: mysql-client (= ${binary:Version}) -Conflicts: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Replaces: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server, - mysql-community-client -Provides: virtual-mysql-server, virtual-mysql-server-core -Description: MySQL Server - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package includes the MySQL server binary as well as related - utilities to run and administer a MySQL server. - -Package: mysql-client -Architecture: any -Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends} -Description: MySQL Client meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql client - package available in the repository. - -Package: mysql-community-client -Architecture: any -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Replaces: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Provides: virtual-mysql-client, virtual-mysql-client-core -Description: MySQL Client - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the standard MySQL clients and - administration tools. - -Package: libmysqlclient18 -Architecture: any -Section: libs -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL shared client libraries - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the shared libraries for MySQL client - applications. - -Package: mysql-common -Architecture: any -Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends} -Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-server-5.6, mysql-server-core-5.6, - mysql-client-5.6, mysql-client-core-5.6, - mariadb-server-5.5, percona-xtradb-cluster-common-5.5 -Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev, - mysql-server-5.6, mysql-server-core-5.6, - mariadb-server-5.5, percona-xtradb-cluster-common-5.5 -Provides: mysql-common, mysql-common-5.6 -Description: MySQL Common - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains common files needed by MySQL client - library, MySQL database server, and MySQL embedded server. - -Package: libmysqlclient-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient18 (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Replaces: mysql-client-5.6, mysql-client-core-5.6 -Description: MySQL development headers - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the development header files necessary - to develop MySQL client applications. - -Package: libmysqld-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient-dev (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL embedded server library - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL server as an embedded library. - -Package: mysql-testsuite -Architecture: any -Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends} -Description: MySQL Testsuite meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql test - package available in the repository. - -Package: mysql-community-test -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - mysql-community-client (= ${binary:Version}), python, - libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5, - mysql-testsuite-5.6, mysql-commercial-test -Description: MySQL Test Run MTR - The MySQL testsuite - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL regression test suite for MySQL - database server. - -Package: mysql-community-bench -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-commercial-bench -Description: MySQL Bench - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. - -Package: mysql-community-source -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: MySQL source - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/copyright b/mysql-wsrep-5.6/packaging/deb-vivid/copyright deleted file mode 100644 index 2c31f240..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/copyright +++ /dev/null @@ -1,41 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: MySQL Server 5.6 -Upstream-Contact: MySQL Release Engineering -Source: http://dev.mysql.com/ - -Copyright: 2000, 2014, 2015, Oracle and/or its affiliates. All rights reserved. -License: - This is a release of MySQL, a dual-license SQL database server. - For the avoidance of doubt, this particular copy of the software - is released under the version 2 of the GNU General Public License. - MySQL is brought to you by Oracle. - . - MySQL FOSS License Exception - We want free and open source software applications under certain - licenses to be able to use specified GPL-licensed MySQL client - libraries despite the fact that not all such FOSS licenses are - compatible with version 2 of the GNU General Public License. - Therefore there are special exceptions to the terms and conditions - of the GPLv2 as applied to these client libraries, which are - identified and described in more detail in the FOSS License - Exception at - . - . - This distribution may include materials developed by third - parties. For license and attribution notices for these - materials, please refer to the documentation that accompanies - this distribution (see the "Licenses for Third-Party Components" - appendix) or view the online documentation at - . - . - GPLv2 Disclaimer - For the avoidance of doubt, except that if any license choice - other than GPL or LGPL is available it will apply instead, - Oracle elects to use only the General Public License version 2 - (GPLv2) at this time for any software where a choice of GPL - license versions is made available with the language indicating - that GPLv2 or any later version may be used, or where a choice - . - The full text of the GNU General Public License version 2 can - be found in the file - `/usr/share/mysql/doc/COPYING'. diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/extra/apparmor-profile b/mysql-wsrep-5.6/packaging/deb-vivid/extra/apparmor-profile deleted file mode 100644 index 5cae3bfa..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/extra/apparmor-profile +++ /dev/null @@ -1,47 +0,0 @@ -# vim:syntax=apparmor -# Last Modified: Fri Feb 28 18:06:30 2014 -#include - -/usr/sbin/mysqld { - #include - #include - #include - -# Allow system resource access - /sys/devices/system/cpu/ r, - capability sys_resource, - capability dac_override, - capability setuid, - capability setgid, - -# Allow config access - /etc/mysql/** r, - -# Allow pid and socket file access - /run/mysqld/mysqld.pid rw, - /run/mysqld/mysqld.sock rw, - -# Allow read/ write to /tmp - /tmp/ r, - /tmp/* rw, - -# Allow execution of server binary - /usr/sbin/mysqld mr, - /usr/sbin/mysqld-debug mr, - -# Allow plugin access - /usr/lib/mysql/plugin/ r, - /usr/lib/mysql/plugin/*.so* mr, - -# Allow error msg and charset access - /usr/share/mysql/ r, - /usr/share/mysql/** r, - -# Allow data dir access - /var/lib/mysql/ r, - /var/lib/mysql/** rwk, - -# Allow log file access - /var/log/mysql/ r, - /var/log/mysql/** rw, -} diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/extra/my.cnf.fallback b/mysql-wsrep-5.6/packaging/deb-vivid/extra/my.cnf.fallback deleted file mode 100644 index a7525cae..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/extra/my.cnf.fallback +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Commercial Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql-systemd-start b/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql-systemd-start deleted file mode 100644 index f4aa9c97..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql-systemd-start +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Scripts to run by MySQL systemd service -# -# Needed argument: pre | post -# -# pre mode : try to perform sanity check for configuration, log, data -# post mode : ping server until answer is received - -pinger () { - while /bin/true ; do - sleep 1 - mysqladmin ping >/dev/null 2>&1 && break - done -} - -sanity () { - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - /lib/init/apparmor-profile-load usr.sbin.mysqld - - if [ ! -r /etc/mysql/my.cnf ]; then - echo "MySQL configuration not found at /etc/mysql/my.cnf. Please install one using update-alternatives." - exit 1 - fi -} - -case $1 in - "pre") sanity ;; - "post") pinger ;; -esac diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql.cnf b/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql.cnf deleted file mode 100644 index 8fa01386..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql.cnf +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Community Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql.conf.cnf b/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql.conf.cnf deleted file mode 100644 index a201d725..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql.conf.cnf +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Commercial Client configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[mysql] diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql_embedded.1 b/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql_embedded.1 deleted file mode 100644 index 735c4e05..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysql_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysql.1 diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysqld.cnf b/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysqld.cnf deleted file mode 100644 index 95ae6d87..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/extra/mysqld.cnf +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Commercial Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[mysqld_safe] -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -explicit_defaults_for_timestamp - -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 - -log-error = /var/log/mysql/error.log - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient-dev.install b/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient-dev.install deleted file mode 100644 index e7e98c15..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient-dev.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql/*.h -usr/include/mysql/mysql/*.h -usr/include/mysql/mysql/*.h.pp -usr/include/mysql/mysql/psi/*.h -usr/lib/*/libmysqlclient.a -usr/lib/*/libmysqlclient.so -usr/lib/*/libmysqlservices.a -usr/bin/mysql_config -usr/bin/mysql_config_editor -usr/share/man/man1/mysql_config.1 -usr/share/man/man1/mysql_config_editor.1 -# legal -usr/share/doc/libmysqlclient-dev/COPYING -usr/share/doc/libmysqlclient-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient-dev.lintian-overrides deleted file mode 100644 index 09960eb2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient-dev.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz -libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient-dev: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient18.install b/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient18.install deleted file mode 100644 index fe6aa56c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient18.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqlclient.so.* -# legal -usr/share/doc/libmysqlclient18/COPYING -usr/share/doc/libmysqlclient18/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient18.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient18.lintian-overrides deleted file mode 100644 index 1f26511a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqlclient18.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz -libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient18: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqld-dev.install b/mysql-wsrep-5.6/packaging/deb-vivid/libmysqld-dev.install deleted file mode 100644 index 923f826a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqld-dev.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqld.a -usr/lib/*/libmysqld-debug.a -# legal -usr/share/doc/libmysqld-dev/COPYING -usr/share/doc/libmysqld-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqld-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/libmysqld-dev.lintian-overrides deleted file mode 100644 index 35caaeca..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/libmysqld-dev.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz -libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-client.install b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-client.install deleted file mode 100644 index 13b877e7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-client.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-client/COPYING -usr/share/doc/mysql-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-client.lintian-overrides deleted file mode 100644 index 5c4891c9..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-client.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql -mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz -mysql-client: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.dirs b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.dirs deleted file mode 100644 index 69265ef0..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.install b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.install deleted file mode 100644 index 8e84e735..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.install +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# configuration file and script -debian/extra/my.cnf.fallback etc/mysql/ -debian/extra/mysql.conf.cnf etc/mysql/conf.d/mysql.cnf - -usr/share/aclocal/mysql.m4 -usr/share/mysql/docs/INFO_SRC -usr/share/mysql/docs/INFO_BIN -usr/share/mysql/docs/ChangeLog -# localized error msgs -usr/share/mysql/*/errmsg.sys -usr/share/mysql/errmsg-utf8.txt -# charsets -usr/share/mysql/charsets/*.xml -usr/share/mysql/charsets/README -# legal -usr/share/doc/mysql-common/COPYING -usr/share/doc/mysql-common/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.lintian-overrides deleted file mode 100644 index 70ddcdf6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql -mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz -mysql-common: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.postinst b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.postinst deleted file mode 100644 index f53bfaa1..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.postinst +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -if [ "$1" = "configure" ]; then - # Low priority fallback for client use when no server is installed. - update-alternatives --install /etc/mysql/my.cnf my.cnf /etc/mysql/my.cnf.fallback 100 -fi - -#DEBHELPER# diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.postrm b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.postrm deleted file mode 100644 index 4698a986..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-common.postrm +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -if [ "$1" = "purge" ]; then - rmdir /etc/mysql 2>/dev/null || true - update-alternatives --remove-all my.cnf -fi - -#DEBHELPER# diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-bench.install b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-bench.install deleted file mode 100644 index 065124bd..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-bench.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql/sql-bench/* -# legal -usr/share/doc/mysql-community-bench/COPYING -usr/share/doc/mysql-community-bench/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-bench.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-bench.lintian-overrides deleted file mode 100644 index 04df14ea..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-bench.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz -mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-client.install b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-client.install deleted file mode 100644 index aa4e6128..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-client.install +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/myisam_ftdump -usr/bin/mysql -usr/bin/mysql_embedded -usr/bin/mysqlaccess -usr/bin/mysqlaccess.conf -usr/bin/mysqladmin -usr/bin/mysqlbug -usr/bin/mysqlcheck -usr/bin/mysql_client_test -usr/bin/mysql_client_test_embedded -usr/bin/mysqldump -usr/bin/mysqldumpslow -usr/bin/mysql_find_rows -usr/bin/mysql_fix_extensions -usr/bin/mysqlimport -usr/bin/mysqlshow -usr/bin/mysqlslap -usr/bin/mysql_waitpid -# man pages -usr/share/man/man1/myisam_ftdump.1 -usr/share/man/man1/mysql.1 -usr/share/man/man1/mysql_embedded.1 -usr/share/man/man1/mysqlaccess.1 -usr/share/man/man1/mysqladmin.1 -usr/share/man/man1/mysqlbug.1 -usr/share/man/man1/mysqlcheck.1 -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqldump.1 -usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 -usr/share/man/man1/mysqlimport.1 -usr/share/man/man1/mysqlman.1 -usr/share/man/man1/mysqlshow.1 -usr/share/man/man1/mysqlslap.1 -usr/share/man/man1/mysql_waitpid.1 -# legal -usr/share/doc/mysql-community-client/COPYING -usr/share/doc/mysql-community-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-client.lintian-overrides deleted file mode 100644 index 58929356..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-client.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql -mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz -mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-client: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.config b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.config deleted file mode 100755 index ceb33733..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.config +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -if [ "$1" = "configure" ] && [ -z "$2" ]; -then - - set -e - - PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server - INSTALLED_PKG=none - MYSQLDATA=/var/lib/mysql - - IFS_BACKUP=${IFS} - IFS=":" - for PKG in ${PKG_LIST}; - do - STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4) - if [ "${STATUS}" = "installed" ]; - then - INSTALLED_PKG=${PKG} - break - fi - done - IFS=${IFS_BACKUP} - - if [ "${INSTALLED_PKG}" = "none" ]; - then - if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ]; - then - db_input high mysql-community-server/data-dir || true - else - db_fset mysql-community-server/data-dir seen true - fi - - while :; do - PASSWD="" - db_input high mysql-community-server/root-pass || true - db_go - - db_get mysql-community-server/root-pass - if [ -z "${RET}" ]; - then - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - break - fi - PASSWD="${RET}" - - db_input high mysql-community-server/re-root-pass || true - db_go - - db_get mysql-community-server/re-root-pass - if [ "${RET}" == "${PASSWD}" ]; - then - PASSWD="" - break - fi - - db_fset mysql-community-server/root-pass-mismatch seen false - db_input critical mysql-community-server/root-pass-mismatch - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - done - - else - db_fset mysql-community-server/data-dir seen true - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - fi - - set +e -fi diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.dirs b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.dirs deleted file mode 100644 index 95711c41..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.dirs +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/mysql.conf.d -etc/init.d -usr/lib/mysql -usr/lib/mysql/plugin diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.install b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.install deleted file mode 100644 index 229a8160..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.install +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/innochecksum -usr/bin/msql2mysql -usr/bin/myisamchk -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/my_print_defaults -usr/bin/mysqlbinlog -usr/bin/mysql_convert_table_format -usr/bin/mysqld_multi -usr/bin/mysqld_safe -usr/bin/mysqlhotcopy -usr/bin/mysql_install_db -usr/bin/mysql_plugin -usr/bin/mysql_secure_installation -usr/bin/mysql_setpermission -usr/bin/mysqltest -usr/bin/mysqltest_embedded -usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_zap -usr/bin/perror -usr/bin/replace -usr/bin/resolveip -usr/bin/resolve_stack_dump -usr/sbin/mysqld -# debug binary -usr/sbin/mysqld-debug -# man pages -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/comp_err.1 -usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 -usr/share/man/man1/myisamlog.1 -usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_plugin.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql.server.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql-stress-test.pl.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man1/mysql_zap.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 -usr/share/man/man1/resolve_stack_dump.1 -usr/share/man/man8/mysqld.8 -# confguration files -debian/extra/mysql.cnf etc/mysql/ -debian/extra/mysqld.cnf etc/mysql/mysql.conf.d/ -# app armor profile -etc/apparmor.d/usr.sbin.mysqld -# SQL files -usr/share/mysql/*.sql -# plugins -usr/lib/mysql/plugin/*.so -usr/lib/mysql/plugin/debug/*.so -usr/lib/mysql/plugin/daemon_example.ini -usr/lib/mysql/plugin/debug/daemon_example.ini -# support files -usr/share/mysql/mysqld_multi.server -usr/share/mysql/magic -usr/share/mysql/mysql-log-rotate -usr/share/mysql/mysql-systemd-start -usr/share/mysql/my-default.cnf -usr/share/mysql/dictionary.txt -# legal -usr/share/doc/mysql-community-server/COPYING -usr/share/doc/mysql-community-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.lintian-overrides deleted file mode 100644 index 08b38654..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.lintian-overrides +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz -mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-server: embedded-library -# Since we ship debug plugins so this error is overridden -mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/* diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.mysql.init b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.mysql.init deleted file mode 100755 index 67a01932..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.mysql.init +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $time -# Should-Stop: $network $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/ Stop MySQL Community Server daemon -# Description: This service script facilitates startup and shutdown of -# mysqld daemon throught its wrapper script mysqld_safe -### END INIT INFO -# - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /lib/lsb/init-functions - -cd / -umask 077 - -MYSQLDATA=/var/lib/mysql -VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4) - -get_mysql_option() { - RESULT=$(my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1) - if [ -z "$RESULT" ]; - then - RESULT="$3" - fi - echo $RESULT -} - -get_running () { - PIDFILE=$(get_mysql_option mysqld_safe pid-file "") - if [ -z "$PIDFILE" ]; - then - PIDFILE=$(get_mysql_option mysqld pid-file "$MYSQLDATA/$(hostname).pid") - fi - if [ -e "$PIDFILE" ] && [ -d "/proc/$(cat "$PIDFILE")" ]; - then - echo 1 - else - echo 0 - fi -} - -server_stop () { - RUNNING=$(get_running) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${RUNNING}" -eq 0 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - RUNNING=$(get_running) - sleep 1 - done - return 0 -} - -case "$1" in - 'start') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "A MySQL Server is already started" - else - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - /lib/init/apparmor-profile-load usr.sbin.mysqld - - su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &" - for i in 1 2 3 4 5 6; - do - sleep 1 - echo -n . - done - echo - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is started" - else - log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details." - fi - fi - ;; - - 'stop') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - killall -15 mysqld - server_stop - if [ "$?" -eq 0 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is stopped" - else - log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out" - fi - else - log_action_msg "MySQL Community Server ${VERSION} is already stopped" - fi - ;; - - 'restart'|'reload'|'force-reload') - log_action_msg "Stopping MySQL Community Server ${VERSION}" - $0 stop - log_action_msg "Re-starting MySQL Community Server ${VERSION}" - $0 start - ;; - - 'status') - RUNNING=$(get_running) - if [ ${RUNNING} -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is running" - else - log_action_msg "MySQL Community Server ${VERSION} is not running" - exit 3 - fi - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.mysql.service b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.mysql.service deleted file mode 100644 index b3e33058..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.mysql.service +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# MySQL systemd service file - -[Unit] -Description=MySQL Community Server -After=network.target - -[Install] -WantedBy=multi-user.target - -[Service] -User=mysql -Group=mysql -PermissionsStartOnly=true -ExecStartPre=/usr/share/mysql/mysql-systemd-start pre -ExecStart=/usr/bin/mysqld_safe -ExecStartPost=/usr/share/mysql/mysql-systemd-start post -TimeoutSec=600 -Restart=on-failure diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.postinst b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.postinst deleted file mode 100755 index ad164e52..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.postinst +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -take_upstart_job_backup () { - if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ]; - then - mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup - fi -} - -case "$1" in - configure) - - if [ -z "$2" ]; - then - set -e - - update-alternatives --install /etc/mysql/my.cnf my.cnf "/etc/mysql/mysql.cnf" 200 - - MYSQLDATA=/var/lib/mysql - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - fi - - db_get mysql-community-server/root-pass && PASSWD=${RET} - if [ ! -z "${PASSWD}" ]; - then - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';" - else - PASSWD="" - fi - - SQL=`mktemp` - if [ -f "${SQL}" ]; - then - chmod 700 ${SQL} - cat << EOF > ${SQL} -USE mysql; -${PASSWD} -DELETE FROM user WHERE user=''; -FLUSH PRIVILEGES; -EOF - mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL - PASSWD="" - rm -f ${SQL} - fi - - set +e - - fi - - ;; - - abort-upgrade|abort-remove|abort-configure) - - ;; - - *) - exit 1 - ;; -esac - -db_stop - -take_upstart_job_backup - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.postrm b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.postrm deleted file mode 100755 index 5d4a7b48..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.postrm +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; -then -. /usr/share/debconf/confmodule -fi - -place_upstart_job_back () { - if [ -e "/var/lib/mysql/.mysql.conf.backup" ]; - then - mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf - fi -} - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - remove) - - set -e - - place_upstart_job_back - update-alternatives --remove my.cnf "/etc/mysql/mysql.cnf" - - set +e - - ;; - - purge) - - set -e - - place_upstart_job_back - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - server_stop - - db_input high mysql-community-server/remove-data-dir || true - db_go - db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET} - if [ "${RMDATADIR}" = "true" ]; - then - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - abort-install) - - set -e - - place_upstart_job_back - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql start || exit $? - else - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - upgrade|abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.preinst b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.preinst deleted file mode 100755 index c769885e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.preinst +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - install) - - if [ -z "$2" ]; - then - - set -e - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql stop || exit $? - server_stop - fi - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - if ! getent group mysql >/dev/null; - then - addgroup --system mysql >/dev/null - fi - - if ! getent passwd mysql >/dev/null; - then - adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null - fi - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - set +e - - fi - - ;; - - upgrade) - - set -e - - #DEBHELPER# - server_stop - - set +e - - ;; - - abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.prerm b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.prerm deleted file mode 100755 index 1386b5d4..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.prerm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -#DEBHELPER# - -set +e - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.templates b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.templates deleted file mode 100644 index 7b7e0ac3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-server.templates +++ /dev/null @@ -1,33 +0,0 @@ -Template: mysql-community-server/root-pass -Type: password -Description: Enter root password: - Please provide a strong password that will be set for the root account of your MySQL database. - Leave it blank if you do not wish to set or change the root password at this time. - -Template: mysql-community-server/re-root-pass -Type: password -Description: Re-enter root password: - Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone. - -Template: mysql-community-server/root-pass-mismatch -Type: error -Description: The two passwords did not match - Please try again. Make sure you type the exact same password twice. - -Template: mysql-community-server/remove-data-dir -Type: boolean -Default: false -Description: Remove data directory at /var/lib/mysql ? - This operation will remove the data directory that stores all the databases, tables and related meta-data. - It is highly recommended to take data backup before removing the data directory. - -Template: mysql-community-server/data-dir -Type: note -Description: Data directory found when no MySQL server package is installed - A data directory '/var/lib/mysql' is present on this system when no MySQL server - package is currently installed on the system. The directory may be under control of - server package received from third-party vendors. It may also be an unclaimed data - directory from previous removal of mysql packages. - . - It is highly recommended to take data backup. If you have not done so, now would be - the time to take backup in another shell. Once completed, press 'Ok' to continue. diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-source.install b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-source.install deleted file mode 100644 index 46a0f12b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-source.install +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -../*.dsc usr/src/mysql/ -../*.tar.gz usr/src/mysql/ -../*.tar.xz usr/src/mysql/ -# legal -usr/share/doc/mysql-community-source/COPYING -usr/share/doc/mysql-community-source/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-source.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-source.lintian-overrides deleted file mode 100644 index 9ca84e90..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-source.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz -mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-test.install b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-test.install deleted file mode 100644 index e70086b3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-test.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/* -usr/share/man/man1/mysql-test-run.pl.1 -# legal -usr/share/doc/mysql-community-test/COPYING -usr/share/doc/mysql-community-test/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-test.links b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-test.links deleted file mode 100644 index bf66c98b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-test.links +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-test.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-test.lintian-overrides deleted file mode 100644 index ff273bbe..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-community-test.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz -mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-server.install b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-server.install deleted file mode 100644 index e3aa8de2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-server.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-server/COPYING -usr/share/doc/mysql-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-server.lintian-overrides deleted file mode 100644 index 48770976..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-server.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql -mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz -mysql-server: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-testsuite.install b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-testsuite.install deleted file mode 100644 index dfc17333..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-testsuite.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-testsuite/COPYING -usr/share/doc/mysql-testsuite/README diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-testsuite.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-vivid/mysql-testsuite.lintian-overrides deleted file mode 100644 index 37488fe6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/mysql-testsuite.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz -mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/patches/fix-man-page-links.patch b/mysql-wsrep-5.6/packaging/deb-vivid/patches/fix-man-page-links.patch deleted file mode 100644 index 004ccdf7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/patches/fix-man-page-links.patch +++ /dev/null @@ -1,14 +0,0 @@ -From: Akhil Mohan -Description: Fix path in man page link. -Bug: http://bugs.mysql.com/bug.php?id=70952 - ---- a/man/mysql_client_test_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysql_client_test_embedded.1 2013-11-14 19:29:56.768315219 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysql_client_test.1 -+.so man1/mysql_client_test.1 ---- a/man/mysqltest_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysqltest_embedded.1 2013-11-14 19:31:19.079280675 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysqltest.1 -+.so man1/mysqltest.1 diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/patches/fix-mtr-search-paths.patch b/mysql-wsrep-5.6/packaging/deb-vivid/patches/fix-mtr-search-paths.patch deleted file mode 100644 index 8a27a091..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/patches/fix-mtr-search-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -From: Akhil Mohan -Description: Adding extra search path for testsuite. - ---- a/mysql-test/lib/mtr_cases.pm 2014-02-24 13:14:37 +0530 -+++ b/mysql-test/lib/mtr_cases.pm 2014-07-02 11:46:24 +0530 -@@ -288,6 +288,7 @@ - { - $suitedir= my_find_dir($::basedir, - ["share/mysql-test/suite", -+ "lib/mysql-test/suite", - "mysql-test/suite", - "internal/mysql-test/suite", - "mysql-test", diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/patches/fix-mysql_install_db.patch b/mysql-wsrep-5.6/packaging/deb-vivid/patches/fix-mysql_install_db.patch deleted file mode 100644 index 41311b2c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/patches/fix-mysql_install_db.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Terje Røsten -Description: Maintains the pending --skip-my-cnf option in mainline -Bug: - -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 440a977..7d068fc 100644 ---- a/scripts/mysql_install_db.pl.in -+++ b/scripts/mysql_install_db.pl.in -@@ -113,6 +113,7 @@ EOF2 - print <{srcdir} and $opt->{basedir} ) - { - error($opt,"Specify either --basedir or --srcdir, not both"); - } --if ( $opt->{'keep-my-cnf'} ) -+if ( $opt->{rpm} || $opt->{'keep-my-cnf'} ) - { - $keep_my_cnf = 1; - } -@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ ) - } - - # ---------------------------------------------------------------------- --# Create database directories mysql & test -+# Create database directory mysql - # ---------------------------------------------------------------------- - - # FIXME The shell variant uses "mkdir -p": -@@ -697,7 +698,7 @@ if ($opt_user) - } - } - --foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" ) -+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql") - { - mkdir($dir, 0700) unless -d $dir; - if ($opt_user and -w "/") diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/patches/series b/mysql-wsrep-5.6/packaging/deb-vivid/patches/series deleted file mode 100644 index e3b20d6f..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/patches/series +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#fix-man-page-links.patch -fix-mysql_install_db.patch -fix-mtr-search-paths.patch diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/rules b/mysql-wsrep-5.6/packaging/deb-vivid/rules deleted file mode 100755 index b9cd814c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/rules +++ /dev/null @@ -1,137 +0,0 @@ -#!/usr/bin/make -f - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -%: - dh $@ - -export DH_VERBOSE=1 -export CFLAGS= -export CXXFLAGS= - -override_dh_auto_configure: - @echo "RULES.$@" - cmake . \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_MYSQLTESTDIR=lib/mysql-test \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=lib/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DWITH_SSL=bundled \ - -DWITH_ZLIB=system \ - -DWITH_EXTRA_CHARSETS=all \ - -DWITH_INNODB_MEMCACHED=1 \ - -DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \ - -DINSTALL_LAYOUT=DEB - - cat CMakeCache.txt - touch $@ - -override_dh_auto_build: - @echo "RULES.$@" - $(MAKE) -j8 VERBOSE=1 - touch $@ - -override_dh_auto_test: - @echo "RULES.$@" - echo "No tests run because test 9: pfs_connect_attr is failing unreasonably" - touch $@ - -override_dh_auto_install: - - @echo "RULES.$@" - # complete install first - $(MAKE) install DESTDIR=debian/tmp - # remove all redundant files and links - rm debian/tmp/usr/lib/*/*_r* - rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake - rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake - rm debian/tmp/usr/lib/mysql-test/Makefile - # add missing man pages - install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1 - # add MySQL Server debug binary and library to package - install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug - install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a - # add debug plugin libraries to package - install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug - for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done - install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug - install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug - # add apparmor profile - install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld - # add systemd script - install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/ - # add directory for legal docs - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18 - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source - # add COPYING file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING - # add README file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README - touch $@ - -override_dh_installinit: - @echo "RULES.$@" - dh_apparmor -pmysql-community-server --profile-name=usr.sbin.mysqld - dh_systemd_enable --name=mysql - dh_installinit --name=mysql -- defaults 19 21 - dh_systemd_start --restart-after-upgrade - touch $@ diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/source/format b/mysql-wsrep-5.6/packaging/deb-vivid/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/source/include-binaries b/mysql-wsrep-5.6/packaging/deb-vivid/source/include-binaries deleted file mode 100644 index 0c23142f..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/source/include-binaries +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins -debian/extra/server-binary -debian/extra/embedded-server -debian/extra/adt_null-plugin -debian/extra/auth-plugin -debian/extra/auth_socket-plugin -debian/extra/auth_test_plugin-plugin -debian/extra/innodb_engine-plugin -debian/extra/libdaemon_example-plugin -debian/extra/libmemcached-plugin -debian/extra/mypluglib-plugin -debian/extra/mysql_no_login-plugin -debian/extra/qa_auth_client-plugin -debian/extra/qa_auth_interface-plugin -debian/extra/qa_auth_server-plugin -debian/extra/semisync_master-plugin -debian/extra/semisync_slave-plugin -debian/extra/test_udf_services-plugin -debian/extra/validate_password-plugin diff --git a/mysql-wsrep-5.6/packaging/deb-vivid/watch b/mysql-wsrep-5.6/packaging/deb-vivid/watch deleted file mode 100644 index c45c5e3e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-vivid/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/changelog b/mysql-wsrep-5.6/packaging/deb-wheezy/changelog deleted file mode 100644 index 87855edb..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/changelog +++ /dev/null @@ -1,82 +0,0 @@ -mysql-community (5.6.25-1debian7) wheezy; urgency=low - - * new upstream release - * mysql-community-server now depends on perl, psmisc - mysql-community-test now depends on python, libmysqlclient-dev - (Closes: #20561621) - - -- Akhil Mohan Wed, 25 Feb 2014 22:52:19 +0530 - -mysql-community (5.6.24-1debian7) wheezy; urgency=low - - * new upstream release - - -- Akhil Mohan Mon, 16 Feb 2014 15:45:09 +0530 - -mysql-community (5.6.23-1debian7) wheezy; urgency=low - - * new upstream release - * mysql-community-server now recommends mysql-client - * removed template install-test-db; not installed by default - * d/compat incremented to 9 from 8 - * d/control updated to build depend on debhelper 9 - * added d/*.lintian-overrides and d/source/lintian-overrides - * d/rules updated to reflect correct file permissions - - -- Akhil Mohan Wed, 31 Dec 2014 10:51:07 +0530 - -mysql-community (5.6.22-1debian7) wheezy; urgency=low - - * new upstream release - * fixed d/*server.postinst to allow dropping test db without - setting root password - * init script will now run my_i_db if data dir is not present or empty - - -- Akhil Mohan Wed, 24 Sep 2014 14:48:07 +0530 - -mysql-community (5.6.21-1debian7) wheezy; urgency=low - - * new upstream release - * updated d/rules to increment -j8 as make option - * updated d/source/include-binaries to add mysql_no_login plugin - * updated CMake option WITH_EXTRA_CHARSETS from complex to all - - -- Akhil Mohan Wed, 20 Aug 2014 19:12:30 +0530 - -mysql-community (5.6.20-1debian7) wheezy; urgency=low - - * new upstream release - * added fakeroot as build-dep in d/control - * added d/*.dirs for bench, dev and test pkg - * updated d/rules to make compilation verbose - * removed default CFLAGS, CXXFLAGS in d/rules - * added patch for testsuite search paths under d/patches - * modified cmake option for testsuite in d/rules - * updated patch d/fix-mysql_install_db.patch - * enabled two patches in d/patches/series - * removed extra permissions check in d/rules when fixed in source - * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf - * modified d/*-test.* for updated location of testsuite - * updated d/{mysql-*-server.install,rules} to include debug plugins - * updated d/rules to remove storage engine cmake options - * modified data dir permission in d/*server.{pre,post}inst - * updated d/source/include-binaries to add debug plugins - * updated d/rules to rename debug plugins - - -- Akhil Mohan Wed, 02 Jul 2014 17:45:30 +0530 - -mysql-community (5.6.19-1debian7) wheezy; urgency=low - - * new upstream release - * d/rules updated to rid of files removed from source - * modified path for source tar in source pkg - * obscured actual filenames in d/source/include-binaries - * modified d/rules to handle obscured filenames - - -- Akhil Mohan Mon, 05 May 2014 15:45:10 +0530 - -mysql-community (5.6.17-1debian7) stable; urgency=low - - * new upstream release - - -- Akhil Mohan Fri, 28 Feb 2014 18:06:30 +0530 diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/compat b/mysql-wsrep-5.6/packaging/deb-wheezy/compat deleted file mode 100644 index ec635144..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/control b/mysql-wsrep-5.6/packaging/deb-wheezy/control deleted file mode 100644 index 4bac0012..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/control +++ /dev/null @@ -1,188 +0,0 @@ -Source: mysql-community -Maintainer: MySQL Release Engineering -Section: database -Priority: optional -Standards-Version: 3.9.3 -Homepage: http://www.mysql.com/ -Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, lsb-release, cmake, fakeroot, libnuma-dev - -Package: mysql-server -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends} -Description: MySQL Server meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql server - package available in the repository. - -Package: mysql-community-server -Architecture: any -Pre-depends: debconf (>= 0.2.17), adduser -Depends: mysql-common (= ${binary:Version}), perl, psmisc, - ${shlibs:Depends}, ${misc:Depends} -Recommends: mysql-client (= ${binary:Version}) -Conflicts: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Replaces: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Provides: virtual-mysql-server, virtual-mysql-server-core, - mysql-server-5.6, mysql-server-core-5.6 -Description: MySQL Server - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package includes the MySQL server binary as well as related - utilities to run and administer a MySQL server. - -Package: mysql-client -Architecture: any -Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends} -Description: MySQL Client meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql client - package available in the repository. - -Package: mysql-community-client -Architecture: any -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Replaces: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Provides: virtual-mysql-client, virtual-mysql-client-core, - mysql-client-5.6, mysql-client-core-5.6 -Description: MySQL Client - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the standard MySQL clients and - administration tools. - -Package: libmysqlclient18 -Architecture: any -Section: libs -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL shared client libraries - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the shared libraries for MySQL client - applications. - -Package: mysql-common -Architecture: any -Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends} -Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql -Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev -Provides: mysql-common -Description: MySQL Common - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains common files needed by MySQL client - library, MySQL database server, and MySQL embedded server. - -Package: libmysqlclient-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient18 (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL development headers - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the development header files necessary - to develop MySQL client applications. - -Package: libmysqld-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient-dev (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL embedded server library - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL server as an embedded library. - -Package: mysql-testsuite -Architecture: any -Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends} -Description: MySQL Testsuite meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql test - package available in the repository. - -Package: mysql-community-test -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - mysql-community-client (= ${binary:Version}), python, - libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5, - mysql-testsuite-5.6, mysql-commercial-test -Description: MySQL Test Run MTR - The MySQL testsuite - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL regression test suite for MySQL - database server. - -Package: mysql-community-bench -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-commercial-bench -Description: MySQL Bench - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. - -Package: mysql-community-source -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: MySQL source - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/copyright b/mysql-wsrep-5.6/packaging/deb-wheezy/copyright deleted file mode 100644 index 482a6765..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/copyright +++ /dev/null @@ -1,41 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: MySQL Server 5.6 -Upstream-Contact: MySQL Release Engineering -Source: http://dev.mysql.com/ - -Copyright: 2000, 2014, Oracle and/or its affiliates. All rights reserved. -License: - This is a release of MySQL, a dual-license SQL database server. - For the avoidance of doubt, this particular copy of the software - is released under the version 2 of the GNU General Public License. - MySQL is brought to you by Oracle. - . - MySQL FOSS License Exception - We want free and open source software applications under certain - licenses to be able to use specified GPL-licensed MySQL client - libraries despite the fact that not all such FOSS licenses are - compatible with version 2 of the GNU General Public License. - Therefore there are special exceptions to the terms and conditions - of the GPLv2 as applied to these client libraries, which are - identified and described in more detail in the FOSS License - Exception at - . - . - This distribution may include materials developed by third - parties. For license and attribution notices for these - materials, please refer to the documentation that accompanies - this distribution (see the "Licenses for Third-Party Components" - appendix) or view the online documentation at - . - . - GPLv2 Disclaimer - For the avoidance of doubt, except that if any license choice - other than GPL or LGPL is available it will apply instead, - Oracle elects to use only the General Public License version 2 - (GPLv2) at this time for any software where a choice of GPL - license versions is made available with the language indicating - that GPLv2 or any later version may be used, or where a choice - . - The full text of the GNU General Public License version 2 can - be found in the file - `/usr/share/mysql/doc/COPYING'. diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/extra/my.cnf b/mysql-wsrep-5.6/packaging/deb-wheezy/extra/my.cnf deleted file mode 100644 index a2b2fd8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/extra/my.cnf +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Community Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[client] -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[mysqld_safe] -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -explicit_defaults_for_timestamp - -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 - -log-error = /var/log/mysql/error.log - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/extra/mysql_embedded.1 b/mysql-wsrep-5.6/packaging/deb-wheezy/extra/mysql_embedded.1 deleted file mode 100644 index 735c4e05..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/extra/mysql_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysql.1 diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient-dev.dirs b/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient-dev.dirs deleted file mode 100644 index 2772b113..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient-dev.dirs +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql -usr/include/mysql/mysql diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient-dev.install b/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient-dev.install deleted file mode 100644 index 6794f18c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient-dev.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql/*.h -usr/include/mysql/mysql/*.h -usr/include/mysql/mysql/*.h.pp -usr/include/mysql/mysql/psi/*.h -usr/lib/*/libmysqlclient.a -usr/lib/*/libmysqlclient.so -usr/lib/*/libmysqlservices.a -usr/bin/mysql_config -usr/bin/mysql_config_editor -usr/share/man/man1/mysql_config.1 -usr/share/man/man1/mysql_config_editor.1 -# legal -usr/share/doc/libmysqlclient-dev/COPYING -usr/share/doc/libmysqlclient-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient-dev.lintian-overrides deleted file mode 100644 index 09960eb2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient-dev.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz -libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient-dev: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient18.install b/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient18.install deleted file mode 100644 index cdfdaa60..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient18.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqlclient.so.* -# legal -usr/share/doc/libmysqlclient18/COPYING -usr/share/doc/libmysqlclient18/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient18.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient18.lintian-overrides deleted file mode 100644 index 1f26511a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqlclient18.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz -libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient18: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqld-dev.install b/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqld-dev.install deleted file mode 100644 index f2b59fcb..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqld-dev.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqld.a -usr/lib/*/libmysqld-debug.a -# legal -usr/share/doc/libmysqld-dev/COPYING -usr/share/doc/libmysqld-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqld-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqld-dev.lintian-overrides deleted file mode 100644 index 35caaeca..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/libmysqld-dev.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz -libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-client.install b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-client.install deleted file mode 100644 index 0a24793e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-client.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-client/COPYING -usr/share/doc/mysql-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-client.lintian-overrides deleted file mode 100644 index 5c4891c9..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-client.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql -mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz -mysql-client: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-common.dirs b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-common.dirs deleted file mode 100644 index a3b0c16a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-common.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-common.install b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-common.install deleted file mode 100644 index 2a547a80..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-common.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/my.cnf -usr/share/aclocal/mysql.m4 -usr/share/mysql/docs/INFO_SRC -usr/share/mysql/docs/INFO_BIN -usr/share/mysql/docs/ChangeLog -# localized error msgs -usr/share/mysql/*/errmsg.sys -usr/share/mysql/errmsg-utf8.txt -# charsets -usr/share/mysql/charsets/*.xml -usr/share/mysql/charsets/README -# legal -usr/share/doc/mysql-common/COPYING -usr/share/doc/mysql-common/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-common.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-common.lintian-overrides deleted file mode 100644 index 70ddcdf6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-common.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql -mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz -mysql-common: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-bench.dirs b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-bench.dirs deleted file mode 100644 index 9d0acf49..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-bench.dirs +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql -usr/lib/mysql/sql-bench diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-bench.install b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-bench.install deleted file mode 100644 index 8aa8be6f..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-bench.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql/sql-bench/* -# legal -usr/share/doc/mysql-community-bench/COPYING -usr/share/doc/mysql-community-bench/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-bench.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-bench.lintian-overrides deleted file mode 100644 index 04df14ea..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-bench.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz -mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-client.install b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-client.install deleted file mode 100644 index c6a27ce6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-client.install +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/innochecksum -usr/bin/myisam_ftdump -usr/bin/mysql -usr/bin/mysql_embedded -usr/bin/mysqlaccess -usr/bin/mysqlaccess.conf -usr/bin/mysqladmin -usr/bin/mysqlbug -usr/bin/mysqlcheck -usr/bin/mysql_client_test -usr/bin/mysql_client_test_embedded -usr/bin/mysqldump -usr/bin/mysqldumpslow -usr/bin/mysql_find_rows -usr/bin/mysql_fix_extensions -usr/bin/mysqlimport -usr/bin/mysql_plugin -usr/bin/mysqlshow -usr/bin/mysqlslap -usr/bin/mysql_waitpid -# man pages -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/myisam_ftdump.1 -usr/share/man/man1/mysql.1 -usr/share/man/man1/mysql_embedded.1 -usr/share/man/man1/mysqlaccess.1 -usr/share/man/man1/mysqladmin.1 -usr/share/man/man1/mysqlbug.1 -usr/share/man/man1/mysqlcheck.1 -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqldump.1 -usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 -usr/share/man/man1/mysqlimport.1 -usr/share/man/man1/mysqlman.1 -usr/share/man/man1/mysql_plugin.1 -usr/share/man/man1/mysqlshow.1 -usr/share/man/man1/mysqlslap.1 -usr/share/man/man1/mysql_waitpid.1 -# legal -usr/share/doc/mysql-community-client/COPYING -usr/share/doc/mysql-community-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-client.lintian-overrides deleted file mode 100644 index 58929356..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-client.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql -mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz -mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-client: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.config b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.config deleted file mode 100755 index cb6c39cf..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.config +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -if [ "$1" = "configure" ] && [ -z "$2" ]; -then - - set -e - - PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server - INSTALLED_PKG=none - MYSQLDATA=/var/lib/mysql - - IFS_BACKUP=${IFS} - IFS=":" - for PKG in ${PKG_LIST}; - do - STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4) - if [ "${STATUS}" = "installed" ]; - then - INSTALLED_PKG=${PKG} - break - fi - done - IFS=${IFS_BACKUP} - - if [ "${INSTALLED_PKG}" = "none" ]; - then - if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ]; - then - db_input high mysql-community-server/data-dir || true - else - db_fset mysql-community-server/data-dir seen true - fi - - while :; do - PASSWD="" - db_input high mysql-community-server/root-pass || true - db_go - - db_get mysql-community-server/root-pass - if [ -z "${RET}" ]; - then - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - break - fi - PASSWD="${RET}" - - db_input high mysql-community-server/re-root-pass || true - db_go - - db_get mysql-community-server/re-root-pass - if [ "${RET}" == "${PASSWD}" ]; - then - PASSWD="" - break - fi - - db_fset mysql-community-server/root-pass-mismatch seen false - db_input critical mysql-community-server/root-pass-mismatch - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - done - - else - db_fset mysql-community-server/data-dir seen true - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - fi - - set +e -fi diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.dirs b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.dirs deleted file mode 100644 index f677b6f3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.dirs +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d -etc/init.d -usr/lib/mysql -usr/lib/mysql/plugin diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.install b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.install deleted file mode 100644 index f311000c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.install +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/msql2mysql -usr/bin/myisamchk -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/my_print_defaults -usr/bin/mysqlbinlog -usr/bin/mysql_convert_table_format -usr/bin/mysqld_multi -usr/bin/mysqld_safe -usr/bin/mysqlhotcopy -usr/bin/mysql_install_db -usr/bin/mysql_secure_installation -usr/bin/mysql_setpermission -usr/bin/mysqltest -usr/bin/mysqltest_embedded -usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_zap -usr/bin/perror -usr/bin/replace -usr/bin/resolveip -usr/bin/resolve_stack_dump -usr/sbin/mysqld -# debug binary -usr/sbin/mysqld-debug -# man pages -usr/share/man/man1/comp_err.1 -usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 -usr/share/man/man1/myisamlog.1 -usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql.server.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql-stress-test.pl.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man1/mysql_zap.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 -usr/share/man/man1/resolve_stack_dump.1 -usr/share/man/man8/mysqld.8 -# SQL files -usr/share/mysql/*.sql -# plugins -usr/lib/mysql/plugin/*.so -usr/lib/mysql/plugin/debug/*.so -usr/lib/mysql/plugin/daemon_example.ini -usr/lib/mysql/plugin/debug/daemon_example.ini -# support files -usr/share/mysql/mysqld_multi.server -usr/share/mysql/magic -usr/share/mysql/mysql-log-rotate -usr/share/mysql/my-default.cnf -usr/share/mysql/dictionary.txt -# legal -usr/share/doc/mysql-community-server/COPYING -usr/share/doc/mysql-community-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.lintian-overrides deleted file mode 100644 index 08b38654..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.lintian-overrides +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz -mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-server: embedded-library -# Since we ship debug plugins so this error is overridden -mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/* diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.mysql.init b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.mysql.init deleted file mode 100755 index d8c08082..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.mysql.init +++ /dev/null @@ -1,190 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $time -# Should-Stop: $network $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/ Stop MySQL Community Server daemon -# Description: This service script facilitates startup and shutdown of -# mysqld daemon throught its wrapper script mysqld_safe -### END INIT INFO -# - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /lib/lsb/init-functions - -cd / -umask 077 - -MYSQLDATA=/var/lib/mysql -VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4) - -get_mysql_option() { - RESULT=$(my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1) - if [ -z "$RESULT" ]; - then - RESULT="$3" - fi - echo $RESULT -} - -get_running () { - PIDFILE=$(get_mysql_option mysqld_safe pid-file "") - if [ -z "$PIDFILE" ]; - then - PIDFILE=$(get_mysql_option mysqld pid-file "$MYSQLDATA/$(hostname).pid") - fi - if [ -e "$PIDFILE" ] && [ -d "/proc/$(cat "$PIDFILE")" ]; - then - echo 1 - else - echo 0 - fi -} - -server_stop () { - RUNNING=$(get_running) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${RUNNING}" -eq 0 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - RUNNING=$(get_running) - sleep 1 - done - return 0 -} - -case "$1" in - 'start') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "A MySQL Server is already started" - else - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &" - for i in 1 2 3 4 5 6; - do - sleep 1 - echo -n . - done - echo - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is started" - else - log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details." - fi - fi - ;; - - 'stop') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - killall -15 mysqld - server_stop - if [ "$?" -eq 0 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is stopped" - else - log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out" - fi - else - log_action_msg "MySQL Community Server ${VERSION} is already stopped" - fi - ;; - - 'restart'|'reload'|'force-reload') - log_action_msg "Stopping MySQL Community Server ${VERSION}" - $0 stop - log_action_msg "Re-starting MySQL Community Server ${VERSION}" - $0 start - ;; - - 'status') - RUNNING=$(get_running) - if [ ${RUNNING} -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is running" - else - log_action_msg "MySQL Community Server ${VERSION} is not running" - exit 3 - fi - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.postinst b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.postinst deleted file mode 100755 index 0fe3dc12..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.postinst +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -take_upstart_job_backup () { - if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ]; - then - mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup - fi -} - -case "$1" in - configure) - -# MySQL 5.6.34 needs this - MYSQLFILES=/var/lib/mysql-files - if [ ! -d ${MYSQLFILES} -a ! -L ${MYSQLFILES} ]; - then - mkdir ${MYSQLFILES} - chown mysql:mysql ${MYSQLFILES} - chmod 770 ${MYSQLFILES} - fi - - if [ -z "$2" ]; - then - set -e - - MYSQLDATA=/var/lib/mysql - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - fi - - db_get mysql-community-server/root-pass && PASSWD=${RET} - if [ ! -z "${PASSWD}" ]; - then - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';" - else - PASSWD="" - fi - - SQL=`mktemp` - if [ -f "${SQL}" ]; - then - chmod 700 ${SQL} - cat << EOF > ${SQL} -USE mysql; -${PASSWD} -DELETE FROM user WHERE user=''; -FLUSH PRIVILEGES; -EOF - mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL - PASSWD="" - rm -f ${SQL} - fi - - set +e - - fi - - ;; - - abort-upgrade|abort-remove|abort-configure) - - ;; - - *) - exit 1 - ;; -esac - -db_stop - -take_upstart_job_backup - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.postrm b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.postrm deleted file mode 100755 index 55f83a3b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.postrm +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; -then -. /usr/share/debconf/confmodule -fi - -place_upstart_job_back () { - if [ -e "/var/lib/mysql/.mysql.conf.backup" ]; - then - mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf - fi -} - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - remove) - - set -e - - place_upstart_job_back - - set +e - - ;; - - purge) - - set -e - - place_upstart_job_back - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - MYSQLFILES=/var/lib/mysql-files - - server_stop - - db_input high mysql-community-server/remove-data-dir || true - db_go - db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET} - if [ "${RMDATADIR}" = "true" ]; - then - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if [ -d ${MYSQLFILES} ] || [ -L ${MYSQLFILES} ]; - then - rm -rf ${MYSQLFILES} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - abort-install) - - set -e - - place_upstart_job_back - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql start || exit $? - else - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if [ -d ${MYSQLFILES} ] || [ -L ${MYSQLFILES} ]; - then - rm -rf ${MYSQLFILES} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - upgrade|abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.preinst b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.preinst deleted file mode 100755 index e5b3b771..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.preinst +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - install) - - if [ -z "$2" ]; - then - - set -e - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql stop || exit $? - server_stop - fi - - MYSQLDATA=/var/lib/mysql - MYSQLFILES=/var/lib/mysql-files - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - if ! getent group mysql >/dev/null; - then - addgroup --system mysql >/dev/null - fi - - if ! getent passwd mysql >/dev/null; - then - adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null - fi - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d ${MYSQLFILES} -a ! -L ${MYSQLFILES} ]; - then - mkdir ${MYSQLFILES} - chown mysql:mysql ${MYSQLFILES} - chmod 770 ${MYSQLFILES} - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - set +e - - fi - - ;; - - upgrade) - - set -e - - #DEBHELPER# - server_stop - - set +e - - ;; - - abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.prerm b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.prerm deleted file mode 100755 index 7509de7a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.prerm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -#DEBHELPER# - -set +e - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.templates b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.templates deleted file mode 100644 index 2469d917..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-server.templates +++ /dev/null @@ -1,34 +0,0 @@ -Template: mysql-community-server/root-pass -Type: password -Description: Enter root password: - Please provide a strong password that will be set for the root account of your MySQL database. - Leave it blank if you do not wish to set or change the root password at this time. - -Template: mysql-community-server/re-root-pass -Type: password -Description: Re-enter root password: - Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone. - -Template: mysql-community-server/root-pass-mismatch -Type: error -Description: The two passwords did not match - Please try again. Make sure you type the exact same password twice. - -Template: mysql-community-server/remove-data-dir -Type: boolean -Default: false -Description: Remove data directory at /var/lib/mysql ? - This operation will remove the data directory that stores all the databases, tables and related meta-data. - Additionally, any import or export files stored at '/var/lib/mysql-files' will be removed along with directory. - It is highly recommended to take data backup before removing the data directory. - -Template: mysql-community-server/data-dir -Type: note -Description: Data directory found when no MySQL server package is installed - A data directory '/var/lib/mysql' is present on this system when no MySQL server - package is currently installed on the system. The directory may be under control of - server package received from third-party vendors. It may also be an unclaimed data - directory from previous removal of mysql packages. - . - It is highly recommended to take data backup. If you have not done so, now would be - the time to take backup in another shell. Once completed, press 'Ok' to continue. diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-source.install b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-source.install deleted file mode 100644 index 326c5dfb..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-source.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -../*.dsc usr/src/mysql/ -../*.tar.gz usr/src/mysql/ -# legal -usr/share/doc/mysql-community-source/COPYING -usr/share/doc/mysql-community-source/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-source.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-source.lintian-overrides deleted file mode 100644 index 9ca84e90..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-source.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz -mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.dirs b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.dirs deleted file mode 100644 index f93ca25b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.install b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.install deleted file mode 100644 index d5f820dd..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/* -usr/share/man/man1/mysql-test-run.pl.1 -# legal -usr/share/doc/mysql-community-test/COPYING -usr/share/doc/mysql-community-test/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.links b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.links deleted file mode 100644 index aedf2db3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.links +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.lintian-overrides deleted file mode 100644 index ff273bbe..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-community-test.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz -mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-server.install b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-server.install deleted file mode 100644 index 07f36ef5..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-server.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-server/COPYING -usr/share/doc/mysql-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-server.lintian-overrides deleted file mode 100644 index 48770976..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-server.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql -mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz -mysql-server: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-testsuite.install b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-testsuite.install deleted file mode 100644 index 6a6e5f50..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-testsuite.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-testsuite/COPYING -usr/share/doc/mysql-testsuite/README diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-testsuite.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-testsuite.lintian-overrides deleted file mode 100644 index 37488fe6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/mysql-testsuite.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz -mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/patches/fix-man-page-links.patch b/mysql-wsrep-5.6/packaging/deb-wheezy/patches/fix-man-page-links.patch deleted file mode 100644 index 004ccdf7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/patches/fix-man-page-links.patch +++ /dev/null @@ -1,14 +0,0 @@ -From: Akhil Mohan -Description: Fix path in man page link. -Bug: http://bugs.mysql.com/bug.php?id=70952 - ---- a/man/mysql_client_test_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysql_client_test_embedded.1 2013-11-14 19:29:56.768315219 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysql_client_test.1 -+.so man1/mysql_client_test.1 ---- a/man/mysqltest_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysqltest_embedded.1 2013-11-14 19:31:19.079280675 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysqltest.1 -+.so man1/mysqltest.1 diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/patches/fix-mtr-search-paths.patch b/mysql-wsrep-5.6/packaging/deb-wheezy/patches/fix-mtr-search-paths.patch deleted file mode 100644 index 8a27a091..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/patches/fix-mtr-search-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -From: Akhil Mohan -Description: Adding extra search path for testsuite. - ---- a/mysql-test/lib/mtr_cases.pm 2014-02-24 13:14:37 +0530 -+++ b/mysql-test/lib/mtr_cases.pm 2014-07-02 11:46:24 +0530 -@@ -288,6 +288,7 @@ - { - $suitedir= my_find_dir($::basedir, - ["share/mysql-test/suite", -+ "lib/mysql-test/suite", - "mysql-test/suite", - "internal/mysql-test/suite", - "mysql-test", diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/patches/fix-mysql_install_db.patch b/mysql-wsrep-5.6/packaging/deb-wheezy/patches/fix-mysql_install_db.patch deleted file mode 100644 index 41311b2c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/patches/fix-mysql_install_db.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Terje Røsten -Description: Maintains the pending --skip-my-cnf option in mainline -Bug: - -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 440a977..7d068fc 100644 ---- a/scripts/mysql_install_db.pl.in -+++ b/scripts/mysql_install_db.pl.in -@@ -113,6 +113,7 @@ EOF2 - print <{srcdir} and $opt->{basedir} ) - { - error($opt,"Specify either --basedir or --srcdir, not both"); - } --if ( $opt->{'keep-my-cnf'} ) -+if ( $opt->{rpm} || $opt->{'keep-my-cnf'} ) - { - $keep_my_cnf = 1; - } -@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ ) - } - - # ---------------------------------------------------------------------- --# Create database directories mysql & test -+# Create database directory mysql - # ---------------------------------------------------------------------- - - # FIXME The shell variant uses "mkdir -p": -@@ -697,7 +698,7 @@ if ($opt_user) - } - } - --foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" ) -+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql") - { - mkdir($dir, 0700) unless -d $dir; - if ($opt_user and -w "/") diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/patches/series b/mysql-wsrep-5.6/packaging/deb-wheezy/patches/series deleted file mode 100644 index 31af2dc7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/patches/series +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#fix-man-page-links.patch -fix-mysql_install_db.patch -fix-mtr-search-paths.patch diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/rules b/mysql-wsrep-5.6/packaging/deb-wheezy/rules deleted file mode 100755 index 386ee62c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/rules +++ /dev/null @@ -1,132 +0,0 @@ -#!/usr/bin/make -f - -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -%: - dh $@ - -export DH_VERBOSE=1 -export CFLAGS= -export CXXFLAGS= - -override_dh_auto_configure: - @echo "RULES.$@" - cmake . \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_MYSQLTESTDIR=lib/mysql-test \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=lib/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DWITH_SSL=bundled \ - -DWITH_ZLIB=system \ - -DWITH_EXTRA_CHARSETS=all \ - -DWITH_INNODB_MEMCACHED=1 \ - -DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \ - -DINSTALL_LAYOUT=DEB - - cat CMakeCache.txt - touch $@ - -override_dh_auto_build: - @echo "RULES.$@" - $(MAKE) -j8 VERBOSE=1 - touch $@ - -override_dh_auto_test: - @echo "RULES.$@" - echo "No tests run because test 9: pfs_connect_attr is failing unreasonably" - touch $@ - -override_dh_auto_install: - - @echo "RULES.$@" - # complete install first - $(MAKE) install DESTDIR=debian/tmp - # remove all redundant files and links - rm debian/tmp/usr/lib/*/*_r* - rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake - rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake - rm debian/tmp/usr/lib/mysql-test/Makefile - # add missing man pages - install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1 - # add MySQL Server configuration file my.cnf to mysql-common package - install -g root -o root -m 0644 -D debian/extra/my.cnf debian/tmp/etc/mysql/my.cnf - # add MySQL Server debug binary and library to package - install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug - install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a - # add debug plugin libraries to package - install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug - for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done - install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug - install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug - # add directory for legal docs - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18 - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source - # add COPYING file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING - # add README file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README - touch $@ - -override_dh_installinit: - @echo "RULES.$@" - dh_installinit --name=mysql -- defaults 19 21 - touch $@ diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/source/format b/mysql-wsrep-5.6/packaging/deb-wheezy/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/source/include-binaries b/mysql-wsrep-5.6/packaging/deb-wheezy/source/include-binaries deleted file mode 100644 index adb5f54b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/source/include-binaries +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins -debian/extra/server-binary -debian/extra/embedded-server -debian/extra/adt_null-plugin -debian/extra/auth-plugin -debian/extra/auth_socket-plugin -debian/extra/auth_test_plugin-plugin -debian/extra/innodb_engine-plugin -debian/extra/libdaemon_example-plugin -debian/extra/libmemcached-plugin -debian/extra/mypluglib-plugin -debian/extra/mysql_no_login-plugin -debian/extra/qa_auth_client-plugin -debian/extra/qa_auth_interface-plugin -debian/extra/qa_auth_server-plugin -debian/extra/semisync_master-plugin -debian/extra/semisync_slave-plugin -debian/extra/test_udf_services-plugin -debian/extra/validate_password-plugin -debian/extra/connection_control-plugin diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/source/lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wheezy/source/lintian-overrides deleted file mode 100644 index 9eefbb7d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/source/lintian-overrides +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# We provide our own versioning scheme so this warning is overridden -mysql-community source: changelog-should-mention-nmu -mysql-community source: source-nmu-has-incorrect-version-number diff --git a/mysql-wsrep-5.6/packaging/deb-wheezy/watch b/mysql-wsrep-5.6/packaging/deb-wheezy/watch deleted file mode 100644 index c45c5e3e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wheezy/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz diff --git a/mysql-wsrep-5.6/packaging/deb-wily/changelog b/mysql-wsrep-5.6/packaging/deb-wily/changelog deleted file mode 100644 index 5d94ab20..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/changelog +++ /dev/null @@ -1,137 +0,0 @@ -mysql-community (5.6.28-1ubuntu15.10) wily; urgency=low - - * New upstream release - - -- Lars Tangvald Thu, 12 Nov 2015 10:34:23 +0100 - -mysql-community (5.6.26-1ubuntu15.04) vivid; urgency=low - - * new upstream release - * mysql-commercial-server now depends on perl, psmisc - mysql-commercial-test now depends on python, libmysqlclient-dev - (Closes: #20893836) - - -- Akhil Mohan Thu, 18 Jun 2015 16:34:10 +0530 - -mysql-community (5.6.25-3ubuntu15.04) vivid; urgency=low - - * new upstream release - * mysql-common now conflicts with - mysql-server-5.6, mysql-server-core-5.6 - mysql-client-5.6, mysql-client-core-5.6 - * mysql-*-server no more provides - mysql-server-5.6, mysql-server-core-5.6 - * mysql-*-client no more provides - mysql-client-5.6, mysql-client-core-5.6 - - -- Akhil Mohan Mon, 15 Jun 2015 16:48:05 +0530 - -mysql-community (5.6.24-3ubuntu15.04) vivid; urgency=low - - * updated Standards-Version to 3.9.6 in d/control - * apparmor profile updated to allow read on all files under /etc/mysql - * added new conf files under d/extra/*.conf - * mysql_plugin moved from client to server pkg - * innochecksum moved from client to server pkg - * server pkg now replaces client pkg - * added systemd service profile and script - * new /etc/mysql/my.cnf management scheme added for Ubuntu 15.04 - as discussed in Dec 2014 for native packaging source - * added dh "--with systemd" for enabling systemd - - -- Akhil Mohan Wed, 27 May 2015 11:35:35 +0530 - -mysql-community (5.6.24-2ubuntu15.04) vivid; urgency=low - - * new upstream release - * forked packaging source from utopic to vivid - - -- Akhil Mohan Wed, 15 Apr 2015 18:52:22 +0530 - -mysql-community (5.6.24-1ubuntu14.10) utopic; urgency=low - - * new upstream release - - -- Akhil Mohan Mon, 16 Feb 2014 15:45:09 +0530 - -mysql-community (5.6.23-1ubuntu14.10) utopic; urgency=low - - * new upstream release - * mysql-community-server now recommends mysql-client - * mysql-community-server now depends on apparmor - * removed template install-test-db; not installed by default - * d/compat incremented to 9 from 8 - * d/control updated to build depend on debhelper 9 - * added d/*.lintian-overrides and d/source/lintian-overrides - * d/rules updated to reflect correct file permissions - - -- Akhil Mohan Wed, 31 Dec 2014 10:51:07 +0530 - -mysql-community (5.6.22-2ubuntu14.10) utopic; urgency=low - - * new upstream release - * mysql-common now replaces mysql-server-{,core-}5.6 - - -- Akhil Mohan Wed, 28 Nov 2014 15:18:07 +0530 - -mysql-community (5.6.22-1ubuntu14.10) utopic; urgency=low - - * new upstream release - * fixed d/*server.postinst to allow dropping test db without - setting root password - * init script will now run my_i_db if data dir is not present or empty - * updated init script to read app armor profile on startup - * forked packaging source from trusty and rebranded for utopic - * updated d/m-c-source.install to pack *.xz packaging source archive - * added more system resources to app armor profile - * dh_apparmor to now run before dh_installinit in d/rules - * libmysqlclient-dev now replaces mysql-client-{,core-}5.6 - - -- Akhil Mohan Wed, 05 Nov 2014 17:04:07 +0530 - -mysql-community (5.6.21-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * updated d/rules to increment -j8 as make option - * updated d/source/include-binaries to add mysql_no_login plugin - * updated CMake option WITH_EXTRA_CHARSETS from complex to all - - -- Akhil Mohan Wed, 20 Aug 2014 19:12:30 +0530 - -mysql-community (5.6.20-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * added fakeroot as build-dep in d/control - * added d/*.dirs for bench, dev and test pkg - * updated d/rules to make compilation verbose - * removed default CFLAGS, CXXFLAGS in d/rules - * added patch for testsuite search paths under d/patches - * modified cmake option for testsuite in d/rules - * updated patch d/fix-mysql_install_db.patch - * enabled two patches in d/patches/series - * removed extra permissions check in d/rules when fixed in source - * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf - * modified d/*-test.* for updated location of testsuite - * updated d/{mysql-*-server.install,rules} to include debug plugins - * updated d/rules to remove storage engine cmake options - * modified data dir permission in d/*server.{pre,post}inst - * updated d/source/include-binaries to add debug plugins - * updated d/rules to rename debug plugins - - -- Akhil Mohan Wed, 02 Jul 2014 17:45:30 +0530 - -mysql-community (5.6.19-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * d/rules updated to rid of files removed from source - * modified path for source tar in source pkg - * obscured actual filenames in d/source/include-binaries - * modified d/rules to handle obscured filenames - - -- Akhil Mohan Mon, 05 May 2014 15:45:10 +0530 - -mysql-community (5.6.17-1ubuntu14.04) trusty; urgency=low - - * new upstream release - - -- Akhil Mohan Fri, 28 Feb 2014 18:06:30 +0530 diff --git a/mysql-wsrep-5.6/packaging/deb-wily/compat b/mysql-wsrep-5.6/packaging/deb-wily/compat deleted file mode 100644 index ec635144..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/mysql-wsrep-5.6/packaging/deb-wily/control b/mysql-wsrep-5.6/packaging/deb-wily/control deleted file mode 100644 index 8bc5ecdf..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/control +++ /dev/null @@ -1,192 +0,0 @@ -Source: mysql-community -Maintainer: MySQL Release Engineering -Section: database -Priority: optional -Standards-Version: 3.9.6 -Homepage: http://www.mysql.com/ -Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, dh-systemd (>= 1.5), lsb-release, cmake, fakeroot, libnuma-dev - -Package: mysql-server -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends} -Description: MySQL Server meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql server - package available in the repository. - -Package: mysql-community-server -Architecture: any -Pre-depends: debconf (>= 0.2.17), adduser -Depends: mysql-common (= ${binary:Version}), apparmor, perl, psmisc, - ${shlibs:Depends}, ${misc:Depends} -Recommends: mysql-client (= ${binary:Version}) -Conflicts: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Replaces: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server, - mysql-community-client -Provides: virtual-mysql-server, virtual-mysql-server-core -Description: MySQL Server - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package includes the MySQL server binary as well as related - utilities to run and administer a MySQL server. - -Package: mysql-client -Architecture: any -Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends} -Description: MySQL Client meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql client - package available in the repository. - -Package: mysql-community-client -Architecture: any -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Replaces: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Provides: virtual-mysql-client, virtual-mysql-client-core -Description: MySQL Client - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the standard MySQL clients and - administration tools. - -Package: libmysqlclient18 -Architecture: any -Section: libs -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL shared client libraries - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the shared libraries for MySQL client - applications. - -Package: mysql-common -Architecture: any -Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends} -Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-server-5.6, mysql-server-core-5.6, - mysql-client-5.6, mysql-client-core-5.6, - mariadb-server-5.5, percona-xtradb-cluster-common-5.5 -Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev, - mysql-server-5.6, mysql-server-core-5.6, - mariadb-server-5.5, percona-xtradb-cluster-common-5.5 -Provides: mysql-common, mysql-common-5.6 -Description: MySQL Common - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains common files needed by MySQL client - library, MySQL database server, and MySQL embedded server. - -Package: libmysqlclient-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient18 (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Replaces: mysql-client-5.6, mysql-client-core-5.6 -Description: MySQL development headers - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the development header files necessary - to develop MySQL client applications. - -Package: libmysqld-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient-dev (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL embedded server library - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL server as an embedded library. - -Package: mysql-testsuite -Architecture: any -Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends} -Description: MySQL Testsuite meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql test - package available in the repository. - -Package: mysql-community-test -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - mysql-community-client (= ${binary:Version}), python, - libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5, - mysql-testsuite-5.6, mysql-commercial-test -Description: MySQL Test Run MTR - The MySQL testsuite - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL regression test suite for MySQL - database server. - -Package: mysql-community-bench -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-commercial-bench -Description: MySQL Bench - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. - -Package: mysql-community-source -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: MySQL source - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. diff --git a/mysql-wsrep-5.6/packaging/deb-wily/copyright b/mysql-wsrep-5.6/packaging/deb-wily/copyright deleted file mode 100644 index 2c31f240..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/copyright +++ /dev/null @@ -1,41 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: MySQL Server 5.6 -Upstream-Contact: MySQL Release Engineering -Source: http://dev.mysql.com/ - -Copyright: 2000, 2014, 2015, Oracle and/or its affiliates. All rights reserved. -License: - This is a release of MySQL, a dual-license SQL database server. - For the avoidance of doubt, this particular copy of the software - is released under the version 2 of the GNU General Public License. - MySQL is brought to you by Oracle. - . - MySQL FOSS License Exception - We want free and open source software applications under certain - licenses to be able to use specified GPL-licensed MySQL client - libraries despite the fact that not all such FOSS licenses are - compatible with version 2 of the GNU General Public License. - Therefore there are special exceptions to the terms and conditions - of the GPLv2 as applied to these client libraries, which are - identified and described in more detail in the FOSS License - Exception at - . - . - This distribution may include materials developed by third - parties. For license and attribution notices for these - materials, please refer to the documentation that accompanies - this distribution (see the "Licenses for Third-Party Components" - appendix) or view the online documentation at - . - . - GPLv2 Disclaimer - For the avoidance of doubt, except that if any license choice - other than GPL or LGPL is available it will apply instead, - Oracle elects to use only the General Public License version 2 - (GPLv2) at this time for any software where a choice of GPL - license versions is made available with the language indicating - that GPLv2 or any later version may be used, or where a choice - . - The full text of the GNU General Public License version 2 can - be found in the file - `/usr/share/mysql/doc/COPYING'. diff --git a/mysql-wsrep-5.6/packaging/deb-wily/extra/apparmor-profile b/mysql-wsrep-5.6/packaging/deb-wily/extra/apparmor-profile deleted file mode 100644 index 5cae3bfa..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/extra/apparmor-profile +++ /dev/null @@ -1,47 +0,0 @@ -# vim:syntax=apparmor -# Last Modified: Fri Feb 28 18:06:30 2014 -#include - -/usr/sbin/mysqld { - #include - #include - #include - -# Allow system resource access - /sys/devices/system/cpu/ r, - capability sys_resource, - capability dac_override, - capability setuid, - capability setgid, - -# Allow config access - /etc/mysql/** r, - -# Allow pid and socket file access - /run/mysqld/mysqld.pid rw, - /run/mysqld/mysqld.sock rw, - -# Allow read/ write to /tmp - /tmp/ r, - /tmp/* rw, - -# Allow execution of server binary - /usr/sbin/mysqld mr, - /usr/sbin/mysqld-debug mr, - -# Allow plugin access - /usr/lib/mysql/plugin/ r, - /usr/lib/mysql/plugin/*.so* mr, - -# Allow error msg and charset access - /usr/share/mysql/ r, - /usr/share/mysql/** r, - -# Allow data dir access - /var/lib/mysql/ r, - /var/lib/mysql/** rwk, - -# Allow log file access - /var/log/mysql/ r, - /var/log/mysql/** rw, -} diff --git a/mysql-wsrep-5.6/packaging/deb-wily/extra/my.cnf.fallback b/mysql-wsrep-5.6/packaging/deb-wily/extra/my.cnf.fallback deleted file mode 100644 index a7525cae..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/extra/my.cnf.fallback +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Commercial Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql-systemd-start b/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql-systemd-start deleted file mode 100644 index f4aa9c97..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql-systemd-start +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Scripts to run by MySQL systemd service -# -# Needed argument: pre | post -# -# pre mode : try to perform sanity check for configuration, log, data -# post mode : ping server until answer is received - -pinger () { - while /bin/true ; do - sleep 1 - mysqladmin ping >/dev/null 2>&1 && break - done -} - -sanity () { - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - /lib/init/apparmor-profile-load usr.sbin.mysqld - - if [ ! -r /etc/mysql/my.cnf ]; then - echo "MySQL configuration not found at /etc/mysql/my.cnf. Please install one using update-alternatives." - exit 1 - fi -} - -case $1 in - "pre") sanity ;; - "post") pinger ;; -esac diff --git a/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql.cnf b/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql.cnf deleted file mode 100644 index 8fa01386..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql.cnf +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Community Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql.conf.cnf b/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql.conf.cnf deleted file mode 100644 index a201d725..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql.conf.cnf +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Commercial Client configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[mysql] diff --git a/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql_embedded.1 b/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql_embedded.1 deleted file mode 100644 index 735c4e05..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/extra/mysql_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysql.1 diff --git a/mysql-wsrep-5.6/packaging/deb-wily/extra/mysqld.cnf b/mysql-wsrep-5.6/packaging/deb-wily/extra/mysqld.cnf deleted file mode 100644 index 95ae6d87..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/extra/mysqld.cnf +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Commercial Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[mysqld_safe] -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -explicit_defaults_for_timestamp - -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 - -log-error = /var/log/mysql/error.log - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 diff --git a/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient-dev.install b/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient-dev.install deleted file mode 100644 index e7e98c15..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient-dev.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql/*.h -usr/include/mysql/mysql/*.h -usr/include/mysql/mysql/*.h.pp -usr/include/mysql/mysql/psi/*.h -usr/lib/*/libmysqlclient.a -usr/lib/*/libmysqlclient.so -usr/lib/*/libmysqlservices.a -usr/bin/mysql_config -usr/bin/mysql_config_editor -usr/share/man/man1/mysql_config.1 -usr/share/man/man1/mysql_config_editor.1 -# legal -usr/share/doc/libmysqlclient-dev/COPYING -usr/share/doc/libmysqlclient-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient-dev.lintian-overrides deleted file mode 100644 index 09960eb2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient-dev.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz -libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient-dev: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient18.install b/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient18.install deleted file mode 100644 index fe6aa56c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient18.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqlclient.so.* -# legal -usr/share/doc/libmysqlclient18/COPYING -usr/share/doc/libmysqlclient18/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient18.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient18.lintian-overrides deleted file mode 100644 index 1f26511a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/libmysqlclient18.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz -libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient18: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-wily/libmysqld-dev.install b/mysql-wsrep-5.6/packaging/deb-wily/libmysqld-dev.install deleted file mode 100644 index 923f826a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/libmysqld-dev.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqld.a -usr/lib/*/libmysqld-debug.a -# legal -usr/share/doc/libmysqld-dev/COPYING -usr/share/doc/libmysqld-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/libmysqld-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/libmysqld-dev.lintian-overrides deleted file mode 100644 index 35caaeca..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/libmysqld-dev.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz -libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-client.install b/mysql-wsrep-5.6/packaging/deb-wily/mysql-client.install deleted file mode 100644 index 13b877e7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-client.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-client/COPYING -usr/share/doc/mysql-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/mysql-client.lintian-overrides deleted file mode 100644 index 5c4891c9..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-client.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql -mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz -mysql-client: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.dirs b/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.dirs deleted file mode 100644 index 69265ef0..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.install b/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.install deleted file mode 100644 index 8e84e735..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.install +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# configuration file and script -debian/extra/my.cnf.fallback etc/mysql/ -debian/extra/mysql.conf.cnf etc/mysql/conf.d/mysql.cnf - -usr/share/aclocal/mysql.m4 -usr/share/mysql/docs/INFO_SRC -usr/share/mysql/docs/INFO_BIN -usr/share/mysql/docs/ChangeLog -# localized error msgs -usr/share/mysql/*/errmsg.sys -usr/share/mysql/errmsg-utf8.txt -# charsets -usr/share/mysql/charsets/*.xml -usr/share/mysql/charsets/README -# legal -usr/share/doc/mysql-common/COPYING -usr/share/doc/mysql-common/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.lintian-overrides deleted file mode 100644 index 70ddcdf6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql -mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz -mysql-common: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.postinst b/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.postinst deleted file mode 100644 index f53bfaa1..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.postinst +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -if [ "$1" = "configure" ]; then - # Low priority fallback for client use when no server is installed. - update-alternatives --install /etc/mysql/my.cnf my.cnf /etc/mysql/my.cnf.fallback 100 -fi - -#DEBHELPER# diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.postrm b/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.postrm deleted file mode 100644 index 4698a986..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-common.postrm +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -if [ "$1" = "purge" ]; then - rmdir /etc/mysql 2>/dev/null || true - update-alternatives --remove-all my.cnf -fi - -#DEBHELPER# diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-bench.install b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-bench.install deleted file mode 100644 index 065124bd..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-bench.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql/sql-bench/* -# legal -usr/share/doc/mysql-community-bench/COPYING -usr/share/doc/mysql-community-bench/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-bench.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-bench.lintian-overrides deleted file mode 100644 index 04df14ea..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-bench.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz -mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-client.install b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-client.install deleted file mode 100644 index aa4e6128..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-client.install +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/myisam_ftdump -usr/bin/mysql -usr/bin/mysql_embedded -usr/bin/mysqlaccess -usr/bin/mysqlaccess.conf -usr/bin/mysqladmin -usr/bin/mysqlbug -usr/bin/mysqlcheck -usr/bin/mysql_client_test -usr/bin/mysql_client_test_embedded -usr/bin/mysqldump -usr/bin/mysqldumpslow -usr/bin/mysql_find_rows -usr/bin/mysql_fix_extensions -usr/bin/mysqlimport -usr/bin/mysqlshow -usr/bin/mysqlslap -usr/bin/mysql_waitpid -# man pages -usr/share/man/man1/myisam_ftdump.1 -usr/share/man/man1/mysql.1 -usr/share/man/man1/mysql_embedded.1 -usr/share/man/man1/mysqlaccess.1 -usr/share/man/man1/mysqladmin.1 -usr/share/man/man1/mysqlbug.1 -usr/share/man/man1/mysqlcheck.1 -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqldump.1 -usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 -usr/share/man/man1/mysqlimport.1 -usr/share/man/man1/mysqlman.1 -usr/share/man/man1/mysqlshow.1 -usr/share/man/man1/mysqlslap.1 -usr/share/man/man1/mysql_waitpid.1 -# legal -usr/share/doc/mysql-community-client/COPYING -usr/share/doc/mysql-community-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-client.lintian-overrides deleted file mode 100644 index 58929356..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-client.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql -mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz -mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-client: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.config b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.config deleted file mode 100755 index ceb33733..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.config +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -if [ "$1" = "configure" ] && [ -z "$2" ]; -then - - set -e - - PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server - INSTALLED_PKG=none - MYSQLDATA=/var/lib/mysql - - IFS_BACKUP=${IFS} - IFS=":" - for PKG in ${PKG_LIST}; - do - STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4) - if [ "${STATUS}" = "installed" ]; - then - INSTALLED_PKG=${PKG} - break - fi - done - IFS=${IFS_BACKUP} - - if [ "${INSTALLED_PKG}" = "none" ]; - then - if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ]; - then - db_input high mysql-community-server/data-dir || true - else - db_fset mysql-community-server/data-dir seen true - fi - - while :; do - PASSWD="" - db_input high mysql-community-server/root-pass || true - db_go - - db_get mysql-community-server/root-pass - if [ -z "${RET}" ]; - then - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - break - fi - PASSWD="${RET}" - - db_input high mysql-community-server/re-root-pass || true - db_go - - db_get mysql-community-server/re-root-pass - if [ "${RET}" == "${PASSWD}" ]; - then - PASSWD="" - break - fi - - db_fset mysql-community-server/root-pass-mismatch seen false - db_input critical mysql-community-server/root-pass-mismatch - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - done - - else - db_fset mysql-community-server/data-dir seen true - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - fi - - set +e -fi diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.dirs b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.dirs deleted file mode 100644 index 95711c41..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.dirs +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/mysql.conf.d -etc/init.d -usr/lib/mysql -usr/lib/mysql/plugin diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.install b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.install deleted file mode 100644 index 229a8160..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.install +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/innochecksum -usr/bin/msql2mysql -usr/bin/myisamchk -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/my_print_defaults -usr/bin/mysqlbinlog -usr/bin/mysql_convert_table_format -usr/bin/mysqld_multi -usr/bin/mysqld_safe -usr/bin/mysqlhotcopy -usr/bin/mysql_install_db -usr/bin/mysql_plugin -usr/bin/mysql_secure_installation -usr/bin/mysql_setpermission -usr/bin/mysqltest -usr/bin/mysqltest_embedded -usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_zap -usr/bin/perror -usr/bin/replace -usr/bin/resolveip -usr/bin/resolve_stack_dump -usr/sbin/mysqld -# debug binary -usr/sbin/mysqld-debug -# man pages -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/comp_err.1 -usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 -usr/share/man/man1/myisamlog.1 -usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_plugin.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql.server.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql-stress-test.pl.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man1/mysql_zap.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 -usr/share/man/man1/resolve_stack_dump.1 -usr/share/man/man8/mysqld.8 -# confguration files -debian/extra/mysql.cnf etc/mysql/ -debian/extra/mysqld.cnf etc/mysql/mysql.conf.d/ -# app armor profile -etc/apparmor.d/usr.sbin.mysqld -# SQL files -usr/share/mysql/*.sql -# plugins -usr/lib/mysql/plugin/*.so -usr/lib/mysql/plugin/debug/*.so -usr/lib/mysql/plugin/daemon_example.ini -usr/lib/mysql/plugin/debug/daemon_example.ini -# support files -usr/share/mysql/mysqld_multi.server -usr/share/mysql/magic -usr/share/mysql/mysql-log-rotate -usr/share/mysql/mysql-systemd-start -usr/share/mysql/my-default.cnf -usr/share/mysql/dictionary.txt -# legal -usr/share/doc/mysql-community-server/COPYING -usr/share/doc/mysql-community-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.lintian-overrides deleted file mode 100644 index 08b38654..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.lintian-overrides +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz -mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-server: embedded-library -# Since we ship debug plugins so this error is overridden -mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/* diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.mysql.init b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.mysql.init deleted file mode 100755 index 67a01932..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.mysql.init +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $time -# Should-Stop: $network $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/ Stop MySQL Community Server daemon -# Description: This service script facilitates startup and shutdown of -# mysqld daemon throught its wrapper script mysqld_safe -### END INIT INFO -# - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /lib/lsb/init-functions - -cd / -umask 077 - -MYSQLDATA=/var/lib/mysql -VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4) - -get_mysql_option() { - RESULT=$(my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1) - if [ -z "$RESULT" ]; - then - RESULT="$3" - fi - echo $RESULT -} - -get_running () { - PIDFILE=$(get_mysql_option mysqld_safe pid-file "") - if [ -z "$PIDFILE" ]; - then - PIDFILE=$(get_mysql_option mysqld pid-file "$MYSQLDATA/$(hostname).pid") - fi - if [ -e "$PIDFILE" ] && [ -d "/proc/$(cat "$PIDFILE")" ]; - then - echo 1 - else - echo 0 - fi -} - -server_stop () { - RUNNING=$(get_running) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${RUNNING}" -eq 0 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - RUNNING=$(get_running) - sleep 1 - done - return 0 -} - -case "$1" in - 'start') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "A MySQL Server is already started" - else - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - /lib/init/apparmor-profile-load usr.sbin.mysqld - - su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &" - for i in 1 2 3 4 5 6; - do - sleep 1 - echo -n . - done - echo - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is started" - else - log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details." - fi - fi - ;; - - 'stop') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - killall -15 mysqld - server_stop - if [ "$?" -eq 0 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is stopped" - else - log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out" - fi - else - log_action_msg "MySQL Community Server ${VERSION} is already stopped" - fi - ;; - - 'restart'|'reload'|'force-reload') - log_action_msg "Stopping MySQL Community Server ${VERSION}" - $0 stop - log_action_msg "Re-starting MySQL Community Server ${VERSION}" - $0 start - ;; - - 'status') - RUNNING=$(get_running) - if [ ${RUNNING} -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is running" - else - log_action_msg "MySQL Community Server ${VERSION} is not running" - exit 3 - fi - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.mysql.service b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.mysql.service deleted file mode 100644 index b3e33058..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.mysql.service +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# MySQL systemd service file - -[Unit] -Description=MySQL Community Server -After=network.target - -[Install] -WantedBy=multi-user.target - -[Service] -User=mysql -Group=mysql -PermissionsStartOnly=true -ExecStartPre=/usr/share/mysql/mysql-systemd-start pre -ExecStart=/usr/bin/mysqld_safe -ExecStartPost=/usr/share/mysql/mysql-systemd-start post -TimeoutSec=600 -Restart=on-failure diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.postinst b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.postinst deleted file mode 100755 index ad164e52..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.postinst +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -take_upstart_job_backup () { - if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ]; - then - mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup - fi -} - -case "$1" in - configure) - - if [ -z "$2" ]; - then - set -e - - update-alternatives --install /etc/mysql/my.cnf my.cnf "/etc/mysql/mysql.cnf" 200 - - MYSQLDATA=/var/lib/mysql - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - fi - - db_get mysql-community-server/root-pass && PASSWD=${RET} - if [ ! -z "${PASSWD}" ]; - then - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';" - else - PASSWD="" - fi - - SQL=`mktemp` - if [ -f "${SQL}" ]; - then - chmod 700 ${SQL} - cat << EOF > ${SQL} -USE mysql; -${PASSWD} -DELETE FROM user WHERE user=''; -FLUSH PRIVILEGES; -EOF - mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL - PASSWD="" - rm -f ${SQL} - fi - - set +e - - fi - - ;; - - abort-upgrade|abort-remove|abort-configure) - - ;; - - *) - exit 1 - ;; -esac - -db_stop - -take_upstart_job_backup - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.postrm b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.postrm deleted file mode 100755 index 5d4a7b48..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.postrm +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; -then -. /usr/share/debconf/confmodule -fi - -place_upstart_job_back () { - if [ -e "/var/lib/mysql/.mysql.conf.backup" ]; - then - mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf - fi -} - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - remove) - - set -e - - place_upstart_job_back - update-alternatives --remove my.cnf "/etc/mysql/mysql.cnf" - - set +e - - ;; - - purge) - - set -e - - place_upstart_job_back - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - server_stop - - db_input high mysql-community-server/remove-data-dir || true - db_go - db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET} - if [ "${RMDATADIR}" = "true" ]; - then - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - abort-install) - - set -e - - place_upstart_job_back - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql start || exit $? - else - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - upgrade|abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.preinst b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.preinst deleted file mode 100755 index c769885e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.preinst +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - install) - - if [ -z "$2" ]; - then - - set -e - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql stop || exit $? - server_stop - fi - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - if ! getent group mysql >/dev/null; - then - addgroup --system mysql >/dev/null - fi - - if ! getent passwd mysql >/dev/null; - then - adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null - fi - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - set +e - - fi - - ;; - - upgrade) - - set -e - - #DEBHELPER# - server_stop - - set +e - - ;; - - abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.prerm b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.prerm deleted file mode 100755 index 1386b5d4..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.prerm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -#DEBHELPER# - -set +e - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.templates b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.templates deleted file mode 100644 index 7b7e0ac3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-server.templates +++ /dev/null @@ -1,33 +0,0 @@ -Template: mysql-community-server/root-pass -Type: password -Description: Enter root password: - Please provide a strong password that will be set for the root account of your MySQL database. - Leave it blank if you do not wish to set or change the root password at this time. - -Template: mysql-community-server/re-root-pass -Type: password -Description: Re-enter root password: - Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone. - -Template: mysql-community-server/root-pass-mismatch -Type: error -Description: The two passwords did not match - Please try again. Make sure you type the exact same password twice. - -Template: mysql-community-server/remove-data-dir -Type: boolean -Default: false -Description: Remove data directory at /var/lib/mysql ? - This operation will remove the data directory that stores all the databases, tables and related meta-data. - It is highly recommended to take data backup before removing the data directory. - -Template: mysql-community-server/data-dir -Type: note -Description: Data directory found when no MySQL server package is installed - A data directory '/var/lib/mysql' is present on this system when no MySQL server - package is currently installed on the system. The directory may be under control of - server package received from third-party vendors. It may also be an unclaimed data - directory from previous removal of mysql packages. - . - It is highly recommended to take data backup. If you have not done so, now would be - the time to take backup in another shell. Once completed, press 'Ok' to continue. diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-source.install b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-source.install deleted file mode 100644 index 46a0f12b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-source.install +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -../*.dsc usr/src/mysql/ -../*.tar.gz usr/src/mysql/ -../*.tar.xz usr/src/mysql/ -# legal -usr/share/doc/mysql-community-source/COPYING -usr/share/doc/mysql-community-source/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-source.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-source.lintian-overrides deleted file mode 100644 index 9ca84e90..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-source.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz -mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-test.install b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-test.install deleted file mode 100644 index e70086b3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-test.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/* -usr/share/man/man1/mysql-test-run.pl.1 -# legal -usr/share/doc/mysql-community-test/COPYING -usr/share/doc/mysql-community-test/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-test.links b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-test.links deleted file mode 100644 index bf66c98b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-test.links +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-test.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-test.lintian-overrides deleted file mode 100644 index ff273bbe..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-community-test.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz -mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-server.install b/mysql-wsrep-5.6/packaging/deb-wily/mysql-server.install deleted file mode 100644 index e3aa8de2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-server.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-server/COPYING -usr/share/doc/mysql-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/mysql-server.lintian-overrides deleted file mode 100644 index 48770976..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-server.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql -mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz -mysql-server: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-testsuite.install b/mysql-wsrep-5.6/packaging/deb-wily/mysql-testsuite.install deleted file mode 100644 index dfc17333..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-testsuite.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-testsuite/COPYING -usr/share/doc/mysql-testsuite/README diff --git a/mysql-wsrep-5.6/packaging/deb-wily/mysql-testsuite.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-wily/mysql-testsuite.lintian-overrides deleted file mode 100644 index 37488fe6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/mysql-testsuite.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz -mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-wily/patches/fix-man-page-links.patch b/mysql-wsrep-5.6/packaging/deb-wily/patches/fix-man-page-links.patch deleted file mode 100644 index 004ccdf7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/patches/fix-man-page-links.patch +++ /dev/null @@ -1,14 +0,0 @@ -From: Akhil Mohan -Description: Fix path in man page link. -Bug: http://bugs.mysql.com/bug.php?id=70952 - ---- a/man/mysql_client_test_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysql_client_test_embedded.1 2013-11-14 19:29:56.768315219 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysql_client_test.1 -+.so man1/mysql_client_test.1 ---- a/man/mysqltest_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysqltest_embedded.1 2013-11-14 19:31:19.079280675 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysqltest.1 -+.so man1/mysqltest.1 diff --git a/mysql-wsrep-5.6/packaging/deb-wily/patches/fix-mtr-search-paths.patch b/mysql-wsrep-5.6/packaging/deb-wily/patches/fix-mtr-search-paths.patch deleted file mode 100644 index 8a27a091..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/patches/fix-mtr-search-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -From: Akhil Mohan -Description: Adding extra search path for testsuite. - ---- a/mysql-test/lib/mtr_cases.pm 2014-02-24 13:14:37 +0530 -+++ b/mysql-test/lib/mtr_cases.pm 2014-07-02 11:46:24 +0530 -@@ -288,6 +288,7 @@ - { - $suitedir= my_find_dir($::basedir, - ["share/mysql-test/suite", -+ "lib/mysql-test/suite", - "mysql-test/suite", - "internal/mysql-test/suite", - "mysql-test", diff --git a/mysql-wsrep-5.6/packaging/deb-wily/patches/fix-mysql_install_db.patch b/mysql-wsrep-5.6/packaging/deb-wily/patches/fix-mysql_install_db.patch deleted file mode 100644 index 41311b2c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/patches/fix-mysql_install_db.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Terje Røsten -Description: Maintains the pending --skip-my-cnf option in mainline -Bug: - -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 440a977..7d068fc 100644 ---- a/scripts/mysql_install_db.pl.in -+++ b/scripts/mysql_install_db.pl.in -@@ -113,6 +113,7 @@ EOF2 - print <{srcdir} and $opt->{basedir} ) - { - error($opt,"Specify either --basedir or --srcdir, not both"); - } --if ( $opt->{'keep-my-cnf'} ) -+if ( $opt->{rpm} || $opt->{'keep-my-cnf'} ) - { - $keep_my_cnf = 1; - } -@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ ) - } - - # ---------------------------------------------------------------------- --# Create database directories mysql & test -+# Create database directory mysql - # ---------------------------------------------------------------------- - - # FIXME The shell variant uses "mkdir -p": -@@ -697,7 +698,7 @@ if ($opt_user) - } - } - --foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" ) -+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql") - { - mkdir($dir, 0700) unless -d $dir; - if ($opt_user and -w "/") diff --git a/mysql-wsrep-5.6/packaging/deb-wily/patches/series b/mysql-wsrep-5.6/packaging/deb-wily/patches/series deleted file mode 100644 index e3b20d6f..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/patches/series +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#fix-man-page-links.patch -fix-mysql_install_db.patch -fix-mtr-search-paths.patch diff --git a/mysql-wsrep-5.6/packaging/deb-wily/rules b/mysql-wsrep-5.6/packaging/deb-wily/rules deleted file mode 100755 index b9cd814c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/rules +++ /dev/null @@ -1,137 +0,0 @@ -#!/usr/bin/make -f - -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -%: - dh $@ - -export DH_VERBOSE=1 -export CFLAGS= -export CXXFLAGS= - -override_dh_auto_configure: - @echo "RULES.$@" - cmake . \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_MYSQLTESTDIR=lib/mysql-test \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=lib/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DWITH_SSL=bundled \ - -DWITH_ZLIB=system \ - -DWITH_EXTRA_CHARSETS=all \ - -DWITH_INNODB_MEMCACHED=1 \ - -DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \ - -DINSTALL_LAYOUT=DEB - - cat CMakeCache.txt - touch $@ - -override_dh_auto_build: - @echo "RULES.$@" - $(MAKE) -j8 VERBOSE=1 - touch $@ - -override_dh_auto_test: - @echo "RULES.$@" - echo "No tests run because test 9: pfs_connect_attr is failing unreasonably" - touch $@ - -override_dh_auto_install: - - @echo "RULES.$@" - # complete install first - $(MAKE) install DESTDIR=debian/tmp - # remove all redundant files and links - rm debian/tmp/usr/lib/*/*_r* - rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake - rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake - rm debian/tmp/usr/lib/mysql-test/Makefile - # add missing man pages - install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1 - # add MySQL Server debug binary and library to package - install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug - install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a - # add debug plugin libraries to package - install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug - for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done - install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug - install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug - # add apparmor profile - install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld - # add systemd script - install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/ - # add directory for legal docs - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18 - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source - # add COPYING file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING - # add README file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README - touch $@ - -override_dh_installinit: - @echo "RULES.$@" - dh_apparmor -pmysql-community-server --profile-name=usr.sbin.mysqld - dh_systemd_enable --name=mysql - dh_installinit --name=mysql -- defaults 19 21 - dh_systemd_start --restart-after-upgrade - touch $@ diff --git a/mysql-wsrep-5.6/packaging/deb-wily/source/format b/mysql-wsrep-5.6/packaging/deb-wily/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/mysql-wsrep-5.6/packaging/deb-wily/source/include-binaries b/mysql-wsrep-5.6/packaging/deb-wily/source/include-binaries deleted file mode 100644 index 0c23142f..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/source/include-binaries +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins -debian/extra/server-binary -debian/extra/embedded-server -debian/extra/adt_null-plugin -debian/extra/auth-plugin -debian/extra/auth_socket-plugin -debian/extra/auth_test_plugin-plugin -debian/extra/innodb_engine-plugin -debian/extra/libdaemon_example-plugin -debian/extra/libmemcached-plugin -debian/extra/mypluglib-plugin -debian/extra/mysql_no_login-plugin -debian/extra/qa_auth_client-plugin -debian/extra/qa_auth_interface-plugin -debian/extra/qa_auth_server-plugin -debian/extra/semisync_master-plugin -debian/extra/semisync_slave-plugin -debian/extra/test_udf_services-plugin -debian/extra/validate_password-plugin diff --git a/mysql-wsrep-5.6/packaging/deb-wily/watch b/mysql-wsrep-5.6/packaging/deb-wily/watch deleted file mode 100644 index c45c5e3e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-wily/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/changelog b/mysql-wsrep-5.6/packaging/deb-xenial/changelog deleted file mode 100644 index 4f4e77ec..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/changelog +++ /dev/null @@ -1,143 +0,0 @@ -mysql-community (5.6.31-1ubuntu16.04) xenial; urgency=medium - - * New upstream release - - -- Lars Tangvald Tue, 03 May 2016 09:30:33 +0200 - -mysql-community (5.6.28-1ubuntu15.10) wily; urgency=low - - * New upstream release - - -- Lars Tangvald Thu, 12 Nov 2015 10:34:23 +0100 - -mysql-community (5.6.26-1ubuntu15.04) vivid; urgency=low - - * new upstream release - * mysql-commercial-server now depends on perl, psmisc - mysql-commercial-test now depends on python, libmysqlclient-dev - (Closes: #20893836) - - -- Akhil Mohan Thu, 18 Jun 2015 16:34:10 +0530 - -mysql-community (5.6.25-3ubuntu15.04) vivid; urgency=low - - * new upstream release - * mysql-common now conflicts with - mysql-server-5.6, mysql-server-core-5.6 - mysql-client-5.6, mysql-client-core-5.6 - * mysql-*-server no more provides - mysql-server-5.6, mysql-server-core-5.6 - * mysql-*-client no more provides - mysql-client-5.6, mysql-client-core-5.6 - - -- Akhil Mohan Mon, 15 Jun 2015 16:48:05 +0530 - -mysql-community (5.6.24-3ubuntu15.04) vivid; urgency=low - - * updated Standards-Version to 3.9.6 in d/control - * apparmor profile updated to allow read on all files under /etc/mysql - * added new conf files under d/extra/*.conf - * mysql_plugin moved from client to server pkg - * innochecksum moved from client to server pkg - * server pkg now replaces client pkg - * added systemd service profile and script - * new /etc/mysql/my.cnf management scheme added for Ubuntu 15.04 - as discussed in Dec 2014 for native packaging source - * added dh "--with systemd" for enabling systemd - - -- Akhil Mohan Wed, 27 May 2015 11:35:35 +0530 - -mysql-community (5.6.24-2ubuntu15.04) vivid; urgency=low - - * new upstream release - * forked packaging source from utopic to vivid - - -- Akhil Mohan Wed, 15 Apr 2015 18:52:22 +0530 - -mysql-community (5.6.24-1ubuntu14.10) utopic; urgency=low - - * new upstream release - - -- Akhil Mohan Mon, 16 Feb 2014 15:45:09 +0530 - -mysql-community (5.6.23-1ubuntu14.10) utopic; urgency=low - - * new upstream release - * mysql-community-server now recommends mysql-client - * mysql-community-server now depends on apparmor - * removed template install-test-db; not installed by default - * d/compat incremented to 9 from 8 - * d/control updated to build depend on debhelper 9 - * added d/*.lintian-overrides and d/source/lintian-overrides - * d/rules updated to reflect correct file permissions - - -- Akhil Mohan Wed, 31 Dec 2014 10:51:07 +0530 - -mysql-community (5.6.22-2ubuntu14.10) utopic; urgency=low - - * new upstream release - * mysql-common now replaces mysql-server-{,core-}5.6 - - -- Akhil Mohan Wed, 28 Nov 2014 15:18:07 +0530 - -mysql-community (5.6.22-1ubuntu14.10) utopic; urgency=low - - * new upstream release - * fixed d/*server.postinst to allow dropping test db without - setting root password - * init script will now run my_i_db if data dir is not present or empty - * updated init script to read app armor profile on startup - * forked packaging source from trusty and rebranded for utopic - * updated d/m-c-source.install to pack *.xz packaging source archive - * added more system resources to app armor profile - * dh_apparmor to now run before dh_installinit in d/rules - * libmysqlclient-dev now replaces mysql-client-{,core-}5.6 - - -- Akhil Mohan Wed, 05 Nov 2014 17:04:07 +0530 - -mysql-community (5.6.21-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * updated d/rules to increment -j8 as make option - * updated d/source/include-binaries to add mysql_no_login plugin - * updated CMake option WITH_EXTRA_CHARSETS from complex to all - - -- Akhil Mohan Wed, 20 Aug 2014 19:12:30 +0530 - -mysql-community (5.6.20-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * added fakeroot as build-dep in d/control - * added d/*.dirs for bench, dev and test pkg - * updated d/rules to make compilation verbose - * removed default CFLAGS, CXXFLAGS in d/rules - * added patch for testsuite search paths under d/patches - * modified cmake option for testsuite in d/rules - * updated patch d/fix-mysql_install_db.patch - * enabled two patches in d/patches/series - * removed extra permissions check in d/rules when fixed in source - * modified d/mysql-*-server.postinst to stop removing /usr/my.cnf - * modified d/*-test.* for updated location of testsuite - * updated d/{mysql-*-server.install,rules} to include debug plugins - * updated d/rules to remove storage engine cmake options - * modified data dir permission in d/*server.{pre,post}inst - * updated d/source/include-binaries to add debug plugins - * updated d/rules to rename debug plugins - - -- Akhil Mohan Wed, 02 Jul 2014 17:45:30 +0530 - -mysql-community (5.6.19-1ubuntu14.04) trusty; urgency=low - - * new upstream release - * d/rules updated to rid of files removed from source - * modified path for source tar in source pkg - * obscured actual filenames in d/source/include-binaries - * modified d/rules to handle obscured filenames - - -- Akhil Mohan Mon, 05 May 2014 15:45:10 +0530 - -mysql-community (5.6.17-1ubuntu14.04) trusty; urgency=low - - * new upstream release - - -- Akhil Mohan Fri, 28 Feb 2014 18:06:30 +0530 diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/compat b/mysql-wsrep-5.6/packaging/deb-xenial/compat deleted file mode 100644 index ec635144..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/control b/mysql-wsrep-5.6/packaging/deb-xenial/control deleted file mode 100644 index 8bc5ecdf..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/control +++ /dev/null @@ -1,192 +0,0 @@ -Source: mysql-community -Maintainer: MySQL Release Engineering -Section: database -Priority: optional -Standards-Version: 3.9.6 -Homepage: http://www.mysql.com/ -Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, dh-systemd (>= 1.5), lsb-release, cmake, fakeroot, libnuma-dev - -Package: mysql-server -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), ${misc:Depends} -Description: MySQL Server meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql server - package available in the repository. - -Package: mysql-community-server -Architecture: any -Pre-depends: debconf (>= 0.2.17), adduser -Depends: mysql-common (= ${binary:Version}), apparmor, perl, psmisc, - ${shlibs:Depends}, ${misc:Depends} -Recommends: mysql-client (= ${binary:Version}) -Conflicts: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server -Replaces: mysql, - mysql-server-5.0, mysql-server-core-5.0, - mysql-server-5.1, mysql-server-core-5.1, - mysql-server-5.5, mysql-server-core-5.5, - mysql-server-5.6, mysql-server-core-5.6, - mysql-commercial-server, - mysql-community-client -Provides: virtual-mysql-server, virtual-mysql-server-core -Description: MySQL Server - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package includes the MySQL server binary as well as related - utilities to run and administer a MySQL server. - -Package: mysql-client -Architecture: any -Depends: mysql-community-client (= ${binary:Version}), ${misc:Depends} -Description: MySQL Client meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql client - package available in the repository. - -Package: mysql-community-client -Architecture: any -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Replaces: mysql, - mysql-client-5.0, mysql-client-core-5.0, - mysql-client-5.1, mysql-client-core-5.1, - mysql-client-5.5, mysql-client-core-5.5, - mysql-client-5.6, mysql-client-core-5.6, - mysql-commercial-client -Provides: virtual-mysql-client, virtual-mysql-client-core -Description: MySQL Client - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the standard MySQL clients and - administration tools. - -Package: libmysqlclient18 -Architecture: any -Section: libs -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Depends: mysql-common (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL shared client libraries - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the shared libraries for MySQL client - applications. - -Package: mysql-common -Architecture: any -Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends} -Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-server-5.6, mysql-server-core-5.6, - mysql-client-5.6, mysql-client-core-5.6, - mariadb-server-5.5, percona-xtradb-cluster-common-5.5 -Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev, - mysql-server-5.6, mysql-server-core-5.6, - mariadb-server-5.5, percona-xtradb-cluster-common-5.5 -Provides: mysql-common, mysql-common-5.6 -Description: MySQL Common - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains common files needed by MySQL client - library, MySQL database server, and MySQL embedded server. - -Package: libmysqlclient-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient18 (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Replaces: mysql-client-5.6, mysql-client-core-5.6 -Description: MySQL development headers - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the development header files necessary - to develop MySQL client applications. - -Package: libmysqld-dev -Architecture: any -Section: libdevel -Depends: libmysqlclient-dev (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Description: MySQL embedded server library - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL server as an embedded library. - -Package: mysql-testsuite -Architecture: any -Depends: mysql-community-test (= ${binary:Version}), ${misc:Depends} -Description: MySQL Testsuite meta package depending on latest version - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This is a meta package that depends on the latest mysql test - package available in the repository. - -Package: mysql-community-test -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - mysql-community-client (= ${binary:Version}), python, - libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, - mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5, - mysql-testsuite-5.6, mysql-commercial-test -Description: MySQL Test Run MTR - The MySQL testsuite - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. This package contains the MySQL regression test suite for MySQL - database server. - -Package: mysql-community-bench -Architecture: any -Depends: mysql-community-server (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: mysql, mysql-commercial-bench -Description: MySQL Bench - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. - -Package: mysql-community-source -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: MySQL source - The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, - and robust SQL (Structured Query Language) database server. MySQL Server - is intended for mission-critical, heavy-load production systems as well - as for embedding into mass-deployed software. MySQL is a trademark of - Oracle. diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/copyright b/mysql-wsrep-5.6/packaging/deb-xenial/copyright deleted file mode 100644 index 0d2a19fa..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/copyright +++ /dev/null @@ -1,41 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: MySQL Server 5.6 -Upstream-Contact: MySQL Release Engineering -Source: http://dev.mysql.com/ - -Copyright: 2000, 2016, Oracle and/or its affiliates. All rights reserved. -License: - This is a release of MySQL, a dual-license SQL database server. - For the avoidance of doubt, this particular copy of the software - is released under the version 2 of the GNU General Public License. - MySQL is brought to you by Oracle. - . - MySQL FOSS License Exception - We want free and open source software applications under certain - licenses to be able to use specified GPL-licensed MySQL client - libraries despite the fact that not all such FOSS licenses are - compatible with version 2 of the GNU General Public License. - Therefore there are special exceptions to the terms and conditions - of the GPLv2 as applied to these client libraries, which are - identified and described in more detail in the FOSS License - Exception at - . - . - This distribution may include materials developed by third - parties. For license and attribution notices for these - materials, please refer to the documentation that accompanies - this distribution (see the "Licenses for Third-Party Components" - appendix) or view the online documentation at - . - . - GPLv2 Disclaimer - For the avoidance of doubt, except that if any license choice - other than GPL or LGPL is available it will apply instead, - Oracle elects to use only the General Public License version 2 - (GPLv2) at this time for any software where a choice of GPL - license versions is made available with the language indicating - that GPLv2 or any later version may be used, or where a choice - . - The full text of the GNU General Public License version 2 can - be found in the file - `/usr/share/mysql/doc/COPYING'. diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/extra/apparmor-profile b/mysql-wsrep-5.6/packaging/deb-xenial/extra/apparmor-profile deleted file mode 100644 index 5cae3bfa..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/extra/apparmor-profile +++ /dev/null @@ -1,47 +0,0 @@ -# vim:syntax=apparmor -# Last Modified: Fri Feb 28 18:06:30 2014 -#include - -/usr/sbin/mysqld { - #include - #include - #include - -# Allow system resource access - /sys/devices/system/cpu/ r, - capability sys_resource, - capability dac_override, - capability setuid, - capability setgid, - -# Allow config access - /etc/mysql/** r, - -# Allow pid and socket file access - /run/mysqld/mysqld.pid rw, - /run/mysqld/mysqld.sock rw, - -# Allow read/ write to /tmp - /tmp/ r, - /tmp/* rw, - -# Allow execution of server binary - /usr/sbin/mysqld mr, - /usr/sbin/mysqld-debug mr, - -# Allow plugin access - /usr/lib/mysql/plugin/ r, - /usr/lib/mysql/plugin/*.so* mr, - -# Allow error msg and charset access - /usr/share/mysql/ r, - /usr/share/mysql/** r, - -# Allow data dir access - /var/lib/mysql/ r, - /var/lib/mysql/** rwk, - -# Allow log file access - /var/log/mysql/ r, - /var/log/mysql/** rw, -} diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/extra/my.cnf.fallback b/mysql-wsrep-5.6/packaging/deb-xenial/extra/my.cnf.fallback deleted file mode 100644 index 4c4004c1..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/extra/my.cnf.fallback +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Commercial Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql-systemd-start b/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql-systemd-start deleted file mode 100644 index d22c44d0..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql-systemd-start +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Scripts to run by MySQL systemd service -# -# Needed argument: pre | post -# -# pre mode : try to perform sanity check for configuration, log, data -# post mode : ping server until answer is received - -pinger () { - while /bin/true ; do - sleep 1 - mysqladmin ping >/dev/null 2>&1 && break - done -} - -sanity () { - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - /lib/init/apparmor-profile-load usr.sbin.mysqld - - if [ ! -r /etc/mysql/my.cnf ]; then - echo "MySQL configuration not found at /etc/mysql/my.cnf. Please install one using update-alternatives." - exit 1 - fi -} - -case $1 in - "pre") sanity ;; - "post") pinger ;; -esac diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql.cnf b/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql.cnf deleted file mode 100644 index 04caab3e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql.cnf +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Community Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql.conf.cnf b/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql.conf.cnf deleted file mode 100644 index b76afea3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql.conf.cnf +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Commercial Client configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[mysql] diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql_embedded.1 b/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql_embedded.1 deleted file mode 100644 index 735c4e05..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysql_embedded.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/mysql.1 diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysqld.cnf b/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysqld.cnf deleted file mode 100644 index f8275a9e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/extra/mysqld.cnf +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Commercial Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[mysqld_safe] -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -explicit_defaults_for_timestamp - -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 - -log-error = /var/log/mysql/error.log - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient-dev.install b/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient-dev.install deleted file mode 100644 index 1040c1c1..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient-dev.install +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/include/mysql/*.h -usr/include/mysql/mysql/*.h -usr/include/mysql/mysql/*.h.pp -usr/include/mysql/mysql/psi/*.h -usr/lib/*/libmysqlclient.a -usr/lib/*/libmysqlclient.so -usr/lib/*/libmysqlservices.a -usr/bin/mysql_config -usr/bin/mysql_config_editor -usr/share/man/man1/mysql_config.1 -usr/share/man/man1/mysql_config_editor.1 -# legal -usr/share/doc/libmysqlclient-dev/COPYING -usr/share/doc/libmysqlclient-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient-dev.lintian-overrides deleted file mode 100644 index 5684af7a..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient-dev.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql -libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz -libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient-dev: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient18.install b/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient18.install deleted file mode 100644 index 34656aec..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient18.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqlclient.so.* -# legal -usr/share/doc/libmysqlclient18/COPYING -usr/share/doc/libmysqlclient18/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient18.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient18.lintian-overrides deleted file mode 100644 index b209f7d6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqlclient18.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql -libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz -libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -libmysqlclient18: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqld-dev.install b/mysql-wsrep-5.6/packaging/deb-xenial/libmysqld-dev.install deleted file mode 100644 index 25d84d70..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqld-dev.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/*/libmysqld.a -usr/lib/*/libmysqld-debug.a -# legal -usr/share/doc/libmysqld-dev/COPYING -usr/share/doc/libmysqld-dev/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqld-dev.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/libmysqld-dev.lintian-overrides deleted file mode 100644 index 5f23271b..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/libmysqld-dev.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql -libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz -libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-client.install b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-client.install deleted file mode 100644 index bdfd3404..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-client.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-client/COPYING -usr/share/doc/mysql-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-client.lintian-overrides deleted file mode 100644 index 3a13702c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-client.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql -mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz -mysql-client: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.dirs b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.dirs deleted file mode 100644 index 6879c646..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.dirs +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/conf.d diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.install b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.install deleted file mode 100644 index 80d940eb..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.install +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# configuration file and script -debian/extra/my.cnf.fallback etc/mysql/ -debian/extra/mysql.conf.cnf etc/mysql/conf.d/mysql.cnf - -usr/share/aclocal/mysql.m4 -usr/share/mysql/docs/INFO_SRC -usr/share/mysql/docs/INFO_BIN -usr/share/mysql/docs/ChangeLog -# localized error msgs -usr/share/mysql/*/errmsg.sys -usr/share/mysql/errmsg-utf8.txt -# charsets -usr/share/mysql/charsets/*.xml -usr/share/mysql/charsets/README -# legal -usr/share/doc/mysql-common/COPYING -usr/share/doc/mysql-common/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.lintian-overrides deleted file mode 100644 index 567b8c95..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql -mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz -mysql-common: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.postinst b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.postinst deleted file mode 100644 index ce1cd9e2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.postinst +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -if [ "$1" = "configure" ]; then - # Low priority fallback for client use when no server is installed. - update-alternatives --install /etc/mysql/my.cnf my.cnf /etc/mysql/my.cnf.fallback 100 -fi - -#DEBHELPER# diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.postrm b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.postrm deleted file mode 100644 index 3c37399e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-common.postrm +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -if [ "$1" = "purge" ]; then - rmdir /etc/mysql 2>/dev/null || true - update-alternatives --remove-all my.cnf -fi - -#DEBHELPER# diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-bench.install b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-bench.install deleted file mode 100644 index bb46ab33..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-bench.install +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql/sql-bench/* -# legal -usr/share/doc/mysql-community-bench/COPYING -usr/share/doc/mysql-community-bench/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-bench.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-bench.lintian-overrides deleted file mode 100644 index 7d6a1cf9..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-bench.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql -mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz -mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-client.install b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-client.install deleted file mode 100644 index 531f12d9..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-client.install +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/myisam_ftdump -usr/bin/mysql -usr/bin/mysql_embedded -usr/bin/mysqlaccess -usr/bin/mysqlaccess.conf -usr/bin/mysqladmin -usr/bin/mysqlbug -usr/bin/mysqlcheck -usr/bin/mysql_client_test -usr/bin/mysql_client_test_embedded -usr/bin/mysqldump -usr/bin/mysqldumpslow -usr/bin/mysql_find_rows -usr/bin/mysql_fix_extensions -usr/bin/mysqlimport -usr/bin/mysqlshow -usr/bin/mysqlslap -usr/bin/mysql_waitpid -# man pages -usr/share/man/man1/myisam_ftdump.1 -usr/share/man/man1/mysql.1 -usr/share/man/man1/mysql_embedded.1 -usr/share/man/man1/mysqlaccess.1 -usr/share/man/man1/mysqladmin.1 -usr/share/man/man1/mysqlbug.1 -usr/share/man/man1/mysqlcheck.1 -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqldump.1 -usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 -usr/share/man/man1/mysqlimport.1 -usr/share/man/man1/mysqlman.1 -usr/share/man/man1/mysqlshow.1 -usr/share/man/man1/mysqlslap.1 -usr/share/man/man1/mysql_waitpid.1 -# legal -usr/share/doc/mysql-community-client/COPYING -usr/share/doc/mysql-community-client/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-client.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-client.lintian-overrides deleted file mode 100644 index fa916a06..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-client.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-client: extra-license-file usr/share/doc/mysql-community-client/LICENSE.mysql -mysql-community-client: extra-license-file usr/share/doc/mysql-community-clienti/COPYING.gz -mysql-community-client: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-client: embedded-library diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.config b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.config deleted file mode 100755 index d97d5348..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.config +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -if [ "$1" = "configure" ] && [ -z "$2" ]; -then - - set -e - - PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-community-server:mysql-commercial-server - INSTALLED_PKG=none - MYSQLDATA=/var/lib/mysql - - IFS_BACKUP=${IFS} - IFS=":" - for PKG in ${PKG_LIST}; - do - STATUS=$(dpkg -s ${PKG} 2> /dev/null | grep Status: | cut -d' ' -f4) - if [ "${STATUS}" = "installed" ]; - then - INSTALLED_PKG=${PKG} - break - fi - done - IFS=${IFS_BACKUP} - - if [ "${INSTALLED_PKG}" = "none" ]; - then - if [ -d ${MYSQLDATA} -o -L ${MYSQLDATA} ]; - then - db_input high mysql-community-server/data-dir || true - else - db_fset mysql-community-server/data-dir seen true - fi - - while :; do - PASSWD="" - db_input high mysql-community-server/root-pass || true - db_go - - db_get mysql-community-server/root-pass - if [ -z "${RET}" ]; - then - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - break - fi - PASSWD="${RET}" - - db_input high mysql-community-server/re-root-pass || true - db_go - - db_get mysql-community-server/re-root-pass - if [ "${RET}" == "${PASSWD}" ]; - then - PASSWD="" - break - fi - - db_fset mysql-community-server/root-pass-mismatch seen false - db_input critical mysql-community-server/root-pass-mismatch - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - done - - else - db_fset mysql-community-server/data-dir seen true - db_fset mysql-community-server/root-pass seen true - db_fset mysql-community-server/re-root-pass seen true - fi - - set +e -fi diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.dirs b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.dirs deleted file mode 100644 index 4a021150..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.dirs +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -etc/mysql/mysql.conf.d -etc/init.d -usr/lib/mysql -usr/lib/mysql/plugin diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.install b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.install deleted file mode 100644 index d5b6b2b0..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.install +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# binaries -usr/bin/innochecksum -usr/bin/msql2mysql -usr/bin/myisamchk -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/my_print_defaults -usr/bin/mysqlbinlog -usr/bin/mysql_convert_table_format -usr/bin/mysqld_multi -usr/bin/mysqld_safe -usr/bin/mysqlhotcopy -usr/bin/mysql_install_db -usr/bin/mysql_plugin -usr/bin/mysql_secure_installation -usr/bin/mysql_setpermission -usr/bin/mysqltest -usr/bin/mysqltest_embedded -usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_zap -usr/bin/perror -usr/bin/replace -usr/bin/resolveip -usr/bin/resolve_stack_dump -usr/sbin/mysqld -# debug binary -usr/sbin/mysqld-debug -# man pages -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/comp_err.1 -usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 -usr/share/man/man1/myisamlog.1 -usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_plugin.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql.server.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql-stress-test.pl.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man1/mysql_zap.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 -usr/share/man/man1/resolve_stack_dump.1 -usr/share/man/man8/mysqld.8 -# confguration files -debian/extra/mysql.cnf etc/mysql/ -debian/extra/mysqld.cnf etc/mysql/mysql.conf.d/ -# app armor profile -etc/apparmor.d/usr.sbin.mysqld -# SQL files -usr/share/mysql/*.sql -# plugins -usr/lib/mysql/plugin/*.so -usr/lib/mysql/plugin/debug/*.so -usr/lib/mysql/plugin/daemon_example.ini -usr/lib/mysql/plugin/debug/daemon_example.ini -# support files -usr/share/mysql/mysqld_multi.server -usr/share/mysql/magic -usr/share/mysql/mysql-log-rotate -usr/share/mysql/mysql-systemd-start -usr/share/mysql/my-default.cnf -usr/share/mysql/dictionary.txt -# legal -usr/share/doc/mysql-community-server/COPYING -usr/share/doc/mysql-community-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.lintian-overrides deleted file mode 100644 index e80759ae..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.lintian-overrides +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/LICENSE.mysql -mysql-community-server: extra-license-file usr/share/doc/mysql-community-server/COPYING.gz -mysql-community-server: copyright-should-refer-to-common-license-file-for-lgpl -# Due to static linking this cannot be avoided and hence being overridden -mysql-community-server: embedded-library -# Since we ship debug plugins so this error is overridden -mysql-community-server: unstripped-binary-or-object usr/lib/mysql/plugin/debug/* diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.mysql.init b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.mysql.init deleted file mode 100755 index cab9cec6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.mysql.init +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $time -# Should-Stop: $network $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/ Stop MySQL Community Server daemon -# Description: This service script facilitates startup and shutdown of -# mysqld daemon throught its wrapper script mysqld_safe -### END INIT INFO -# - -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /lib/lsb/init-functions - -cd / -umask 077 - -MYSQLDATA=/var/lib/mysql -VERSION=$(mysqld --version | grep mysqld | cut -d' ' -f4) - -get_mysql_option() { - RESULT=$(my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1) - if [ -z "$RESULT" ]; - then - RESULT="$3" - fi - echo $RESULT -} - -get_running () { - PIDFILE=$(get_mysql_option mysqld_safe pid-file "") - if [ -z "$PIDFILE" ]; - then - PIDFILE=$(get_mysql_option mysqld pid-file "$MYSQLDATA/$(hostname).pid") - fi - if [ -e "$PIDFILE" ] && [ -d "/proc/$(cat "$PIDFILE")" ]; - then - echo 1 - else - echo 0 - fi -} - -server_stop () { - RUNNING=$(get_running) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${RUNNING}" -eq 0 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - RUNNING=$(get_running) - sleep 1 - done - return 0 -} - -case "$1" in - 'start') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "A MySQL Server is already started" - else - MYSQLRUN=/var/run/mysqld - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - fi - - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - /lib/init/apparmor-profile-load usr.sbin.mysqld - - su - mysql -s /bin/bash -c "mysqld_safe > /dev/null &" - for i in 1 2 3 4 5 6; - do - sleep 1 - echo -n . - done - echo - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is started" - else - log_action_msg "MySQL Community Server ${VERSION} did not start. Please check logs for more details." - fi - fi - ;; - - 'stop') - RUNNING=$(get_running) - if [ "${RUNNING}" -eq 1 ]; - then - killall -15 mysqld - server_stop - if [ "$?" -eq 0 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is stopped" - else - log_action_msg "Attempt to shutdown MySQL Community Server ${VERSION} timed out" - fi - else - log_action_msg "MySQL Community Server ${VERSION} is already stopped" - fi - ;; - - 'restart'|'reload'|'force-reload') - log_action_msg "Stopping MySQL Community Server ${VERSION}" - $0 stop - log_action_msg "Re-starting MySQL Community Server ${VERSION}" - $0 start - ;; - - 'status') - RUNNING=$(get_running) - if [ ${RUNNING} -eq 1 ]; - then - log_action_msg "MySQL Community Server ${VERSION} is running" - else - log_action_msg "MySQL Community Server ${VERSION} is not running" - exit 3 - fi - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.mysql.service b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.mysql.service deleted file mode 100644 index e38ab613..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.mysql.service +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# MySQL systemd service file - -[Unit] -Description=MySQL Community Server -After=network.target - -[Install] -WantedBy=multi-user.target - -[Service] -User=mysql -Group=mysql -PermissionsStartOnly=true -ExecStartPre=/usr/share/mysql/mysql-systemd-start pre -ExecStart=/usr/bin/mysqld_safe -ExecStartPost=/usr/share/mysql/mysql-systemd-start post -TimeoutSec=600 -Restart=on-failure diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.postinst b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.postinst deleted file mode 100755 index 246c2779..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.postinst +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -. /usr/share/debconf/confmodule - -take_upstart_job_backup () { - if [ -e "/etc/init/mysql.conf" ] && [ -d "/var/lib/mysql" ]; - then - mv /etc/init/mysql.conf /var/lib/mysql/.mysql.conf.backup - fi -} - -case "$1" in - configure) - - if [ -z "$2" ]; - then - set -e - - update-alternatives --install /etc/mysql/my.cnf my.cnf "/etc/mysql/mysql.cnf" 200 - - MYSQLDATA=/var/lib/mysql - - if [ ! -d "${MYSQLDATA}/mysql" -a ! -L "${MYSQLDATA}/mysql" ]; - then - mkdir ${MYSQLDATA}/mysql - chown mysql:mysql ${MYSQLDATA}/mysql - chmod 750 ${MYSQLDATA}/mysql - if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ]; - then - mysql_install_db --user=mysql > /dev/null - fi - fi - - db_get mysql-community-server/root-pass && PASSWD=${RET} - if [ ! -z "${PASSWD}" ]; - then - db_set mysql-community-server/root-pass "" - db_set mysql-community-server/re-root-pass "" - PASSWD="UPDATE user SET password=PASSWORD('${PASSWD}') WHERE user='root';" - else - PASSWD="" - fi - - SQL=`mktemp` - if [ -f "${SQL}" ]; - then - chmod 700 ${SQL} - cat << EOF > ${SQL} -USE mysql; -${PASSWD} -DELETE FROM user WHERE user=''; -FLUSH PRIVILEGES; -EOF - mysqld --basedir=/usr --bootstrap --user=mysql --skip-grant-tables < $SQL - PASSWD="" - rm -f ${SQL} - fi - - set +e - - fi - - ;; - - abort-upgrade|abort-remove|abort-configure) - - ;; - - *) - exit 1 - ;; -esac - -db_stop - -take_upstart_job_backup - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.postrm b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.postrm deleted file mode 100755 index 6d9b3ec7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.postrm +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; -then -. /usr/share/debconf/confmodule -fi - -place_upstart_job_back () { - if [ -e "/var/lib/mysql/.mysql.conf.backup" ]; - then - mv /var/lib/mysql/.mysql.conf.backup /etc/init/mysql.conf - fi -} - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - remove) - - set -e - - place_upstart_job_back - update-alternatives --remove my.cnf "/etc/mysql/mysql.cnf" - - set +e - - ;; - - purge) - - set -e - - place_upstart_job_back - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - server_stop - - db_input high mysql-community-server/remove-data-dir || true - db_go - db_get mysql-community-server/remove-data-dir && RMDATADIR=${RET} - if [ "${RMDATADIR}" = "true" ]; - then - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - abort-install) - - set -e - - place_upstart_job_back - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql start || exit $? - else - if [ -d ${MYSQLRUN} ] || [ -L ${MYSQLRUN} ]; - then - rm -rf ${MYSQLRUN} - fi - - if [ -d ${MYSQLLOG} ] || [ -L ${MYSQLLOG} ]; - then - rm -rf ${MYSQLLOG} - fi - - if [ -d ${MYSQLDATA} ] || [ -L ${MYSQLDATA} ]; - then - rm -rf ${MYSQLDATA} - fi - - if getent passwd mysql >/dev/null; - then - userdel mysql - fi - fi - - set +e - ;; - - upgrade|abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.preinst b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.preinst deleted file mode 100755 index 2a747ba5..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.preinst +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -get_pcount () { - PSCOUNT=$(ps -ef | grep "/usr/sbin/mysqld" | wc -l) - echo "${PSCOUNT}" -} - -server_stop () { - PSCOUNT=$(get_pcount) - COUNT=0 - while :; do - COUNT=$(( COUNT+1 )) - echo -n . - if [ "${PSCOUNT}" -eq 1 ]; - then - echo - break - fi - if [ "${COUNT}" -gt 15 ]; - then - echo - return 1 - fi - PSCOUNT=$(get_pcount) - sleep 1 - done - return 0 -} - -case "$1" in - install) - - if [ -z "$2" ]; - then - - set -e - - if [ -x "/etc/init.d/mysql" ]; - then - invoke-rc.d mysql stop || exit $? - server_stop - fi - - MYSQLDATA=/var/lib/mysql - MYSQLLOG=/var/log/mysql - MYSQLRUN=/var/run/mysqld - - if ! getent group mysql >/dev/null; - then - addgroup --system mysql >/dev/null - fi - - if ! getent passwd mysql >/dev/null; - then - adduser --ingroup mysql --system --disabled-login --no-create-home --home ${MYSQLDATA} --shell /bin/false --gecos "MySQL Server" mysql >/dev/null - fi - - if [ ! -d ${MYSQLDATA} -a ! -L ${MYSQLDATA} ]; - then - mkdir ${MYSQLDATA} - chown mysql:mysql ${MYSQLDATA} - chmod 750 ${MYSQLDATA} - fi - - if [ ! -d ${MYSQLLOG} -a ! -L ${MYSQLLOG} ]; - then - mkdir ${MYSQLLOG} - chown mysql:adm ${MYSQLLOG} - chmod 750 ${MYSQLLOG} - touch ${MYSQLLOG}/error.log - chmod 640 ${MYSQLLOG}/error.log - chown mysql:adm ${MYSQLLOG}/error.log - fi - - if [ ! -d ${MYSQLRUN} -a ! -L ${MYSQLRUN} ]; - then - mkdir ${MYSQLRUN} - chown mysql:mysql ${MYSQLRUN} - chmod 755 ${MYSQLRUN} - fi - - set +e - - fi - - ;; - - upgrade) - - set -e - - #DEBHELPER# - server_stop - - set +e - - ;; - - abort-upgrade) - - ;; - - *) - exit 1 - ;; -esac - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.prerm b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.prerm deleted file mode 100755 index 642c03d8..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.prerm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -e - -#DEBHELPER# - -set +e - -exit 0 diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.templates b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.templates deleted file mode 100644 index 7b7e0ac3..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-server.templates +++ /dev/null @@ -1,33 +0,0 @@ -Template: mysql-community-server/root-pass -Type: password -Description: Enter root password: - Please provide a strong password that will be set for the root account of your MySQL database. - Leave it blank if you do not wish to set or change the root password at this time. - -Template: mysql-community-server/re-root-pass -Type: password -Description: Re-enter root password: - Now that you have selected a password for the root account, please confirm by typing it again. Do not share the password with anyone. - -Template: mysql-community-server/root-pass-mismatch -Type: error -Description: The two passwords did not match - Please try again. Make sure you type the exact same password twice. - -Template: mysql-community-server/remove-data-dir -Type: boolean -Default: false -Description: Remove data directory at /var/lib/mysql ? - This operation will remove the data directory that stores all the databases, tables and related meta-data. - It is highly recommended to take data backup before removing the data directory. - -Template: mysql-community-server/data-dir -Type: note -Description: Data directory found when no MySQL server package is installed - A data directory '/var/lib/mysql' is present on this system when no MySQL server - package is currently installed on the system. The directory may be under control of - server package received from third-party vendors. It may also be an unclaimed data - directory from previous removal of mysql packages. - . - It is highly recommended to take data backup. If you have not done so, now would be - the time to take backup in another shell. Once completed, press 'Ok' to continue. diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-source.install b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-source.install deleted file mode 100644 index 8c3fbbb2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-source.install +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -../*.dsc usr/src/mysql/ -../*.tar.gz usr/src/mysql/ -../*.tar.xz usr/src/mysql/ -# legal -usr/share/doc/mysql-community-source/COPYING -usr/share/doc/mysql-community-source/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-source.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-source.lintian-overrides deleted file mode 100644 index 82479233..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-source.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/LICENSE.mysql -mysql-community-source: extra-license-file usr/share/doc/mysql-community-source/COPYING.gz -mysql-community-source: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-test.install b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-test.install deleted file mode 100644 index 5b33d488..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-test.install +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/* -usr/share/man/man1/mysql-test-run.pl.1 -# legal -usr/share/doc/mysql-community-test/COPYING -usr/share/doc/mysql-community-test/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-test.links b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-test.links deleted file mode 100644 index 6a68af05..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-test.links +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mysql-test-run -usr/lib/mysql-test/mysql-test-run.pl usr/lib/mysql-test/mtr diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-test.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-test.lintian-overrides deleted file mode 100644 index 38315bcf..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-community-test.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/LICENSE.mysql -mysql-community-test: extra-license-file usr/share/doc/mysql-community-test/COPYING.gz -mysql-community-test: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-server.install b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-server.install deleted file mode 100644 index 47255da6..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-server.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-server/COPYING -usr/share/doc/mysql-server/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-server.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-server.lintian-overrides deleted file mode 100644 index 8642e14c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-server.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql -mysql-server: extra-license-file usr/share/doc/mysql-server/COPYING.gz -mysql-server: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-testsuite.install b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-testsuite.install deleted file mode 100644 index 342af045..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-testsuite.install +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# legal -usr/share/doc/mysql-testsuite/COPYING -usr/share/doc/mysql-testsuite/README diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-testsuite.lintian-overrides b/mysql-wsrep-5.6/packaging/deb-xenial/mysql-testsuite.lintian-overrides deleted file mode 100644 index fd192af2..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/mysql-testsuite.lintian-overrides +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# Additional license file is needed so overriding this warning -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql -mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/COPYING.gz -mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/patches/fix-man-page-links.patch b/mysql-wsrep-5.6/packaging/deb-xenial/patches/fix-man-page-links.patch deleted file mode 100644 index 004ccdf7..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/patches/fix-man-page-links.patch +++ /dev/null @@ -1,14 +0,0 @@ -From: Akhil Mohan -Description: Fix path in man page link. -Bug: http://bugs.mysql.com/bug.php?id=70952 - ---- a/man/mysql_client_test_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysql_client_test_embedded.1 2013-11-14 19:29:56.768315219 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysql_client_test.1 -+.so man1/mysql_client_test.1 ---- a/man/mysqltest_embedded.1 2013-11-08 19:00:22.000000000 +0530 -+++ b/man/mysqltest_embedded.1 2013-11-14 19:31:19.079280675 +0530 -@@ -1 +1 @@ --.so man-gpl-tmp2/mysqltest.1 -+.so man1/mysqltest.1 diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/patches/fix-mtr-search-paths.patch b/mysql-wsrep-5.6/packaging/deb-xenial/patches/fix-mtr-search-paths.patch deleted file mode 100644 index 8a27a091..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/patches/fix-mtr-search-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -From: Akhil Mohan -Description: Adding extra search path for testsuite. - ---- a/mysql-test/lib/mtr_cases.pm 2014-02-24 13:14:37 +0530 -+++ b/mysql-test/lib/mtr_cases.pm 2014-07-02 11:46:24 +0530 -@@ -288,6 +288,7 @@ - { - $suitedir= my_find_dir($::basedir, - ["share/mysql-test/suite", -+ "lib/mysql-test/suite", - "mysql-test/suite", - "internal/mysql-test/suite", - "mysql-test", diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/patches/fix-mysql_install_db.patch b/mysql-wsrep-5.6/packaging/deb-xenial/patches/fix-mysql_install_db.patch deleted file mode 100644 index 41311b2c..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/patches/fix-mysql_install_db.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Terje Røsten -Description: Maintains the pending --skip-my-cnf option in mainline -Bug: - -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 440a977..7d068fc 100644 ---- a/scripts/mysql_install_db.pl.in -+++ b/scripts/mysql_install_db.pl.in -@@ -113,6 +113,7 @@ EOF2 - print <{srcdir} and $opt->{basedir} ) - { - error($opt,"Specify either --basedir or --srcdir, not both"); - } --if ( $opt->{'keep-my-cnf'} ) -+if ( $opt->{rpm} || $opt->{'keep-my-cnf'} ) - { - $keep_my_cnf = 1; - } -@@ -664,7 +665,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ ) - } - - # ---------------------------------------------------------------------- --# Create database directories mysql & test -+# Create database directory mysql - # ---------------------------------------------------------------------- - - # FIXME The shell variant uses "mkdir -p": -@@ -697,7 +698,7 @@ if ($opt_user) - } - } - --foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" ) -+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql") - { - mkdir($dir, 0700) unless -d $dir; - if ($opt_user and -w "/") diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/patches/series b/mysql-wsrep-5.6/packaging/deb-xenial/patches/series deleted file mode 100644 index 48069e28..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/patches/series +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -#fix-man-page-links.patch -fix-mysql_install_db.patch -fix-mtr-search-paths.patch diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/rules b/mysql-wsrep-5.6/packaging/deb-xenial/rules deleted file mode 100755 index e81d6a22..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/rules +++ /dev/null @@ -1,137 +0,0 @@ -#!/usr/bin/make -f - -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -%: - dh $@ - -export DH_VERBOSE=1 -export CFLAGS= -export CXXFLAGS= - -override_dh_auto_configure: - @echo "RULES.$@" - cmake . \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_MYSQLTESTDIR=lib/mysql-test \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=lib/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DWITH_SSL=bundled \ - -DWITH_ZLIB=system \ - -DWITH_EXTRA_CHARSETS=all \ - -DWITH_INNODB_MEMCACHED=1 \ - -DCOMPILATION_COMMENT="MySQL Community Server (GPL)" \ - -DINSTALL_LAYOUT=DEB - - cat CMakeCache.txt - touch $@ - -override_dh_auto_build: - @echo "RULES.$@" - $(MAKE) -j8 VERBOSE=1 - touch $@ - -override_dh_auto_test: - @echo "RULES.$@" - echo "No tests run because test 9: pfs_connect_attr is failing unreasonably" - touch $@ - -override_dh_auto_install: - - @echo "RULES.$@" - # complete install first - $(MAKE) install DESTDIR=debian/tmp - # remove all redundant files and links - rm debian/tmp/usr/lib/*/*_r* - rm debian/tmp/usr/lib/mysql-test/cmake_install.cmake - rm debian/tmp/usr/lib/mysql-test/CTestTestfile.cmake - rm debian/tmp/usr/lib/mysql-test/Makefile - # add missing man pages - install -g root -o root -m 0644 debian/extra/mysql_embedded.1 debian/tmp/usr/share/man/man1 - # add MySQL Server debug binary and library to package - install -g root -o root -m 0755 debian/extra/server-binary debian/tmp/usr/sbin/mysqld-debug - install -g root -o root -m 0755 debian/extra/embedded-server debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqld-debug.a - # add debug plugin libraries to package - install -g root -o root -m 0755 -d debian/tmp/usr/lib/mysql/plugin/debug - for file in debian/extra/*-plugin; do NEW=`echo $$file | cut -d- -f1`; mv $$file $$NEW.so; done - install -g root -o root -m 0755 debian/extra/*.so debian/tmp/usr/lib/mysql/plugin/debug - install -g root -o root -m 0755 debian/extra/daemon_example.ini debian/tmp/usr/lib/mysql/plugin/debug - # add apparmor profile - install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld - # add systemd script - install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/ - # add directory for legal docs - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-server - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-client - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-common - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient18 - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqlclient-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/libmysqld-dev - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-bench - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-testsuite - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-test - install -g root -o root -m 0755 -d debian/tmp/usr/share/doc/mysql-community-source - # add COPYING file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-server/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-client/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-common/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient18/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqlclient-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/libmysqld-dev/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-bench/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-testsuite/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-test/COPYING - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/COPYING debian/tmp/usr/share/doc/mysql-community-source/COPYING - # add README file to each package - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-server/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-client/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-common/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient18/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqlclient-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/libmysqld-dev/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-bench/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-testsuite/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-test/README - install -g root -o root -m 0644 debian/tmp/usr/share/mysql/README debian/tmp/usr/share/doc/mysql-community-source/README - touch $@ - -override_dh_installinit: - @echo "RULES.$@" - dh_apparmor -pmysql-community-server --profile-name=usr.sbin.mysqld - dh_systemd_enable --name=mysql - dh_installinit --name=mysql -- defaults 19 21 - dh_systemd_start --restart-after-upgrade - touch $@ diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/source/format b/mysql-wsrep-5.6/packaging/deb-xenial/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/source/include-binaries b/mysql-wsrep-5.6/packaging/deb-xenial/source/include-binaries deleted file mode 100644 index a1992308..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/source/include-binaries +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# obscured filename for mysqld-debug, libmysqld-debug.a and debug plugins -debian/extra/server-binary -debian/extra/embedded-server -debian/extra/adt_null-plugin -debian/extra/auth-plugin -debian/extra/auth_socket-plugin -debian/extra/auth_test_plugin-plugin -debian/extra/innodb_engine-plugin -debian/extra/libdaemon_example-plugin -debian/extra/libmemcached-plugin -debian/extra/mypluglib-plugin -debian/extra/mysql_no_login-plugin -debian/extra/qa_auth_client-plugin -debian/extra/qa_auth_interface-plugin -debian/extra/qa_auth_server-plugin -debian/extra/semisync_master-plugin -debian/extra/semisync_slave-plugin -debian/extra/test_udf_services-plugin -debian/extra/validate_password-plugin diff --git a/mysql-wsrep-5.6/packaging/deb-xenial/watch b/mysql-wsrep-5.6/packaging/deb-xenial/watch deleted file mode 100644 index c45c5e3e..00000000 --- a/mysql-wsrep-5.6/packaging/deb-xenial/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-([\d\.]+).tar.gz diff --git a/mysql-wsrep-5.6/packaging/rpm-docker/my.cnf b/mysql-wsrep-5.6/packaging/rpm-docker/my.cnf index c1c03c1c..db392733 100644 --- a/mysql-wsrep-5.6/packaging/rpm-docker/my.cnf +++ b/mysql-wsrep-5.6/packaging/rpm-docker/my.cnf @@ -1,5 +1,5 @@ # For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html +# http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html [mysqld] # diff --git a/mysql-wsrep-5.6/packaging/rpm-fedora/mysql.spec.in b/mysql-wsrep-5.6/packaging/rpm-fedora/mysql.spec.in index b9bd5eb2..6fe1abaf 100644 --- a/mysql-wsrep-5.6/packaging/rpm-fedora/mysql.spec.in +++ b/mysql-wsrep-5.6/packaging/rpm-fedora/mysql.spec.in @@ -350,7 +350,7 @@ mkdir debug -DCMAKE_CXX_FLAGS="$optflags" \ -DWITH_INNODB_MEMCACHED=1 \ -DINSTALL_LIBDIR="%{_lib}/mysql" \ - -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \ + -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin/debug" \ -DINSTALL_SQLBENCHDIR=share \ -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ -DFEATURE_SET="%{feature_set}" \ @@ -440,6 +440,14 @@ rm -rf %{buildroot}%{_bindir}/mysql_embedded rm -rf %{buildroot}%{_bindir}/mysql_setpermission rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1* +# Remove obsoleted man pages +rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1 +rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1 +rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1 +rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1 +rm -f %{buildroot}%{_mandir}/man1/mysqltest.1 +rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1 + %check %if 0%{?runselftest} pushd release @@ -698,13 +706,6 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so -%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1* -%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1* -%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1* -%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1* -%attr(644, root, root) %{_mandir}/man1/mysqltest.1* -%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1* - %files bench %defattr(-, root, root, -) %doc %{?license_files_server} @@ -725,6 +726,9 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n %attr(755, root, root) %{_libdir}/mysql/libmysqld.so %changelog +* Tue Oct 31 2017 Bjorn Munch - 5.6.39-1 +- Remove obsoleted mysqltest man pages + * Mon Oct 31 2016 Balasubramanian Kandasamy - 5.6.35-1 - Add connection_control.so to server subpackage diff --git a/mysql-wsrep-5.6/packaging/rpm-oel/mysql.spec.in b/mysql-wsrep-5.6/packaging/rpm-oel/mysql.spec.in index c5da35b2..ec56869d 100644 --- a/mysql-wsrep-5.6/packaging/rpm-oel/mysql.spec.in +++ b/mysql-wsrep-5.6/packaging/rpm-oel/mysql.spec.in @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -507,7 +507,7 @@ mkdir debug -DCMAKE_CXX_FLAGS="$optflags" \ -DWITH_INNODB_MEMCACHED=1 \ -DINSTALL_LIBDIR="%{_lib}/mysql" \ - -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \ + -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin/debug" \ -DINSTALL_SQLBENCHDIR=share \ -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ -DFEATURE_SET="%{feature_set}" \ @@ -613,6 +613,14 @@ rm -rf %{buildroot}%{_bindir}/mysql_embedded rm -rf %{buildroot}%{_bindir}/mysql_setpermission rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1* +# Remove obsoleted man pages +rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1 +rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1 +rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1 +rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1 +rm -f %{buildroot}%{_mandir}/man1/mysqltest.1 +rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1 + %check %if 0%{?runselftest} pushd release @@ -702,7 +710,6 @@ fi %attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1* %attr(644, root, root) %{_mandir}/man1/mysqlman.1* %attr(644, root, root) %{_mandir}/man1/mysql.server.1* -%attr(644, root, root) %{_mandir}/man1/mysqltest.1* %attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1* %attr(644, root, root) %{_mandir}/man1/mysql_zap.1* %attr(644, root, root) %{_mandir}/man1/mysqlbug.1* @@ -922,13 +929,6 @@ fi %doc %{?license_files_server} %attr(-, root, root) %{_datadir}/mysql-test %attr(755, root, root) %{_bindir}/mysql_client_test -%attr(755, root, root) %{_bindir}/mysql_client_test_embedded -%attr(755, root, root) %{_bindir}/mysqltest_embedded -%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1* -%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1* -%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1* -%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1* -%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1* %files bench %defattr(-, root, root, -) @@ -956,6 +956,9 @@ fi %endif %changelog +* Tue Oct 31 2017 Bjorn Munch - 5.6.39-1 +- Remove obsoleted mysqltest man pages + * Mon Oct 31 2016 Balasubramanian Kandasamy - 5.6.35-1 - Add connection_control.so to server subpackage diff --git a/mysql-wsrep-5.6/packaging/rpm-sles/mysql.spec.in b/mysql-wsrep-5.6/packaging/rpm-sles/mysql.spec.in index ca349493..86bfdfa3 100644 --- a/mysql-wsrep-5.6/packaging/rpm-sles/mysql.spec.in +++ b/mysql-wsrep-5.6/packaging/rpm-sles/mysql.spec.in @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -389,7 +389,7 @@ mkdir debug -DCMAKE_CXX_FLAGS="$optflags" \ -DWITH_INNODB_MEMCACHED=1 \ -DINSTALL_LIBDIR="%{_lib}/mysql" \ - -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \ + -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin/debug" \ -DINSTALL_SQLBENCHDIR=share \ -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ -DFEATURE_SET="%{feature_set}" \ @@ -476,6 +476,14 @@ rm -rf %{buildroot}%{_bindir}/mysql_setpermission rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1* rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql +# Remove obsoleted man pages +rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1 +rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1 +rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1 +rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1 +rm -f %{buildroot}%{_mandir}/man1/mysqltest.1 +rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1 + # rcmysql symlink install -d %{buildroot}%{_sbindir} %if 0%{?systemd} @@ -577,7 +585,6 @@ fi %attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1* %attr(644, root, root) %{_mandir}/man1/mysqlman.1* %attr(644, root, root) %{_mandir}/man1/mysql.server.1* -%attr(644, root, root) %{_mandir}/man1/mysqltest.1* %attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1* %attr(644, root, root) %{_mandir}/man1/mysql_zap.1* %attr(644, root, root) %{_mandir}/man1/mysqlbug.1* @@ -779,9 +786,7 @@ fi %doc %{?license_files_server} %attr(-, root, root) %{_datadir}/mysql-test %attr(755, root, root) %{_bindir}/mysql_client_test -%attr(755, root, root) %{_bindir}/mysql_client_test_embedded %attr(755, root, root) %{_bindir}/mysqltest -%attr(755, root, root) %{_bindir}/mysqltest_embedded %attr(755, root, root) %{_libdir}/mysql/plugin/auth.so %attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so @@ -799,13 +804,6 @@ fi %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so -%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1* -%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1* -%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1* -%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1* -%attr(644, root, root) %{_mandir}/man1/mysqltest.1* -%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1* - %files bench %defattr(-, root, root, -) %doc %{?license_files_server} @@ -826,6 +824,9 @@ fi %attr(755, root, root) %{_libdir}/mysql/libmysqld.so %changelog +* Tue Oct 31 2017 Bjorn Munch - 5.6.39-1 +- Remove obsoleted mysqltest man pages + * Mon Oct 31 2016 Balasubramanian Kandasamy - 5.6.35-1 - Add connection_control.so to server subpackage diff --git a/mysql-wsrep-5.6/plugin/semisync/semisync_master.cc b/mysql-wsrep-5.6/plugin/semisync/semisync_master.cc index a2d03bc2..7ba6254b 100644 --- a/mysql-wsrep-5.6/plugin/semisync/semisync_master.cc +++ b/mysql-wsrep-5.6/plugin/semisync/semisync_master.cc @@ -1,5 +1,5 @@ /* Copyright (C) 2007 Google Inc. - Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -813,7 +813,15 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name, entry->n_waiters++; wait_result= mysql_cond_timedwait(&entry->cond, &LOCK_binlog_, &abstime); entry->n_waiters--; - rpl_semi_sync_master_wait_sessions--; + /* + After we release LOCK_binlog_ above while waiting for the condition, + it can happen that some other parallel client session executed + RESET MASTER. That can set rpl_semi_sync_master_wait_sessions to zero. + Hence check the value before decrementing it and decrement it only if it is + non-zero value. + */ + if (rpl_semi_sync_master_wait_sessions > 0) + rpl_semi_sync_master_wait_sessions--; if (wait_result != 0) { diff --git a/mysql-wsrep-5.6/sql/CMakeLists.txt b/mysql-wsrep-5.6/sql/CMakeLists.txt index 6610f75f..bc1e430b 100644 --- a/mysql-wsrep-5.6/sql/CMakeLists.txt +++ b/mysql-wsrep-5.6/sql/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,10 +27,12 @@ INCLUDE_DIRECTORIES( ${WSREP_INCLUDES} ) +SET(CONF_SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc +) SET(GEN_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.h ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc - ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h ) SET(GEN_DIGEST_SOURCES @@ -38,6 +40,7 @@ SET(GEN_DIGEST_SOURCES ) SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES} + ${CONF_SOURCES} ${GEN_DIGEST_SOURCES} PROPERTIES GENERATED 1) @@ -213,6 +216,7 @@ ENDIF() SET(SQL_SOURCE ${WSREP_SOURCES} ${GEN_SOURCES} + ${CONF_SOURCES} ${GEN_DIGEST_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ${SQL_SHARED_SOURCES} diff --git a/mysql-wsrep-5.6/sql/field.cc b/mysql-wsrep-5.6/sql/field.cc index 9ee8847d..d6f93a5b 100644 --- a/mysql-wsrep-5.6/sql/field.cc +++ b/mysql-wsrep-5.6/sql/field.cc @@ -10616,9 +10616,11 @@ Field_temporal::set_datetime_warning(Sql_condition::enum_warning_level level, make_truncated_value_warning(thd, level, val, ts_type, field_name); } -bool Field::is_part_of_actual_key(THD *thd, uint cur_index) +bool Field::is_part_of_actual_key(THD *thd, uint cur_index, KEY *cur_index_info) { - return thd->optimizer_switch_flag(OPTIMIZER_SWITCH_USE_INDEX_EXTENSIONS) ? + return + thd->optimizer_switch_flag(OPTIMIZER_SWITCH_USE_INDEX_EXTENSIONS) && + !(cur_index_info->flags & HA_NOSAME) ? part_of_key.is_set(cur_index) : part_of_key_not_extended.is_set(cur_index); } diff --git a/mysql-wsrep-5.6/sql/field.h b/mysql-wsrep-5.6/sql/field.h index e5f82aba..52021a2f 100644 --- a/mysql-wsrep-5.6/sql/field.h +++ b/mysql-wsrep-5.6/sql/field.h @@ -1,7 +1,7 @@ #ifndef FIELD_INCLUDED #define FIELD_INCLUDED -/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1254,16 +1254,18 @@ public: /** Check whether field is part of the index taking the index extensions flag - into account. + into account. Index extensions are also not applicable to UNIQUE indexes + for loose index scans. @param[in] thd THD object @param[in] cur_index Index of the key + @param[in] cur_index_info key_info object @retval true Field is part of the key @retval false otherwise */ - bool is_part_of_actual_key(THD *thd, uint cur_index); + bool is_part_of_actual_key(THD *thd, uint cur_index, KEY *cur_index_info); friend int cre_myisam(char * name, register TABLE *form, uint options, ulonglong auto_increment_value); diff --git a/mysql-wsrep-5.6/sql/gcalc_slicescan.h b/mysql-wsrep-5.6/sql/gcalc_slicescan.h index e0841449..10362c4b 100644 --- a/mysql-wsrep-5.6/sql/gcalc_slicescan.h +++ b/mysql-wsrep-5.6/sql/gcalc_slicescan.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. reserved. reserved. This program is free software; you can redistribute it and/or modify @@ -134,6 +134,7 @@ public: #ifndef DBUG_OFF inline void dbug_print() const; #endif + Info(): x(0), y(0) {} }; Gcalc_heap(size_t blk_size=8192) : diff --git a/mysql-wsrep-5.6/sql/gcalc_tools.cc b/mysql-wsrep-5.6/sql/gcalc_tools.cc index a1adbb24..ccbfb713 100644 --- a/mysql-wsrep-5.6/sql/gcalc_tools.cc +++ b/mysql-wsrep-5.6/sql/gcalc_tools.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -447,6 +447,11 @@ int Gcalc_result_receiver::complete_shape() } else { + if (cur_shape == Gcalc_function::shape_point) + { + DBUG_RETURN(1); + } + DBUG_ASSERT(cur_shape != Gcalc_function::shape_point); if (cur_shape == Gcalc_function::shape_hole || cur_shape == Gcalc_function::shape_polygon) @@ -1173,8 +1178,13 @@ int Gcalc_operation_reducer::get_polygon_result(res_point *cur, { DBUG_ENTER("Gcalc_operation_reducer::get_polygon_result"); res_point *glue= cur->glue; - glue->up->down= NULL; - free_result(glue); + if(glue) + { + if(glue->up) + glue->up->down= NULL; + free_result(glue); + cur->glue= NULL; + } DBUG_RETURN(get_result_thread(cur, storage, 1) || storage->complete_shape()); } @@ -1261,10 +1271,21 @@ int Gcalc_operation_reducer::get_result(Gcalc_result_receiver *storage) DBUG_ENTER("Gcalc_operation_reducer::get_result"); Dynamic_array chunks; bool polygons_found= false; + int counter= 0; *m_res_hook= NULL; while (m_result) { + /** + Handle cyclic graph scenario. This can occur due to invalid input + geometry. Ideally the comparison should be with length of the string. + We have choosen an arbitory number suitable for practical usecase's + due to the complexity involved in checking with the length. + */ + counter++; + if (counter > 10000) + DBUG_RETURN(1); + Gcalc_function::shape_type shape; Gcalc_result_receiver::chunk_info chunk; diff --git a/mysql-wsrep-5.6/sql/gcalc_tools.h b/mysql-wsrep-5.6/sql/gcalc_tools.h index 73c45096..e4288c87 100644 --- a/mysql-wsrep-5.6/sql/gcalc_tools.h +++ b/mysql-wsrep-5.6/sql/gcalc_tools.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -200,7 +200,8 @@ public: #endif }; - Gcalc_result_receiver() : collection_result(FALSE), n_shapes(0), n_holes(0) + Gcalc_result_receiver() : n_points(0), collection_result(FALSE), n_shapes(0), + n_holes(0), prev_x(0), prev_y(0), shape_area(0) {} int start_shape(Gcalc_function::shape_type shape); int add_point(double x, double y); @@ -353,11 +354,17 @@ private: bool intersection_point) { res_point *result= (res_point *) new_item(); + result->up= result->down= result->glue= NULL; + result->set_outer_poly(NULL); + result->pi= NULL; + result->first_poly_node= NULL; *m_res_hook= result; result->prev_hook= m_res_hook; m_res_hook= &result->next; result->pi= pi; result->intersection_point= intersection_point; + result->x= 0; + result->y= 0; return result; } diff --git a/mysql-wsrep-5.6/sql/ha_partition.cc b/mysql-wsrep-5.6/sql/ha_partition.cc index ae4c5f0c..45d96856 100644 --- a/mysql-wsrep-5.6/sql/ha_partition.cc +++ b/mysql-wsrep-5.6/sql/ha_partition.cc @@ -708,7 +708,7 @@ int ha_partition::create_handler_files(const char *path, int ha_partition::create(const char *name, TABLE *table_arg, HA_CREATE_INFO *create_info) { - int error; + int error= 0; char name_buff[FN_REFLEN + 1], name_lc_buff[FN_REFLEN + 1]; char *name_buffer_ptr; const char *path; @@ -3323,7 +3323,16 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked) } m_start_key.length= 0; m_rec0= table->record[0]; - m_rec_length= table_share->reclength; + legacy_db_type db_type = ha_legacy_type(m_part_info->default_engine_type); + if(db_type == DB_TYPE_HEAP) + { + m_rec_length= table_share->rec_buff_length; + } + else { + m_rec_length= table_share->rec_buff_length; + } + DBUG_ASSERT(db_type != DB_TYPE_UNKNOWN); + if (!m_part_ids_sorted_by_num_of_records) { if (!(m_part_ids_sorted_by_num_of_records= @@ -5421,9 +5430,16 @@ int ha_partition::index_first(uchar * buf) int ha_partition::index_last(uchar * buf) { DBUG_ENTER("ha_partition::index_last"); - + int error = HA_ERR_END_OF_FILE; + uint part_id = bitmap_get_first_set(&(m_part_info->read_partitions)); + if (part_id == MY_BIT_NONE) + { + /* No partition to scan. */ + DBUG_RETURN(error); + } m_index_scan_type= partition_index_last; DBUG_RETURN(common_first_last(buf)); + } /* diff --git a/mysql-wsrep-5.6/sql/item.cc b/mysql-wsrep-5.6/sql/item.cc index 767c6b07..f6119b2a 100644 --- a/mysql-wsrep-5.6/sql/item.cc +++ b/mysql-wsrep-5.6/sql/item.cc @@ -4758,31 +4758,6 @@ void mark_select_range_as_dependent(THD *thd, } } - -/** - Find a Item reference in a item list - - @param[in] item The Item to search for. - @param[in] list Item list. - - @retval true found - @retval false otherwise -*/ - -static bool find_item_in_item_list (Item *item, List *list) -{ - List_iterator li(*list); - Item *it= NULL; - while ((it= li++)) - { - if (it->walk(&Item::find_item_processor, true, - (uchar*)item)) - return true; - } - return false; -} - - /** Search a GROUP BY clause for a field with a certain name. @@ -8203,7 +8178,7 @@ Item *Item_default_value::transform(Item_transformer transformer, uchar *args) bool Item_insert_value::eq(const Item *item, bool binary_cmp) const { return item->type() == INSERT_VALUE_ITEM && - ((Item_default_value *)item)->arg->eq(arg, binary_cmp); + ((Item_insert_value *)item)->arg->eq(arg, binary_cmp); } @@ -8233,7 +8208,7 @@ bool Item_insert_value::fix_fields(THD *thd, Item **reference) Item_field *field_arg= (Item_field *)arg; if (field_arg->field->table->insert_values && - find_item_in_item_list(this, &thd->lex->value_list)) + thd->lex->in_update_value_clause) { Field *def_field= field_arg->field->clone(); if (!def_field) diff --git a/mysql-wsrep-5.6/sql/item.h b/mysql-wsrep-5.6/sql/item.h index 0ad01712..748ba2f1 100644 --- a/mysql-wsrep-5.6/sql/item.h +++ b/mysql-wsrep-5.6/sql/item.h @@ -4061,6 +4061,8 @@ public: { return Item_field::save_in_field(field_arg, no_conversions); } + + enum Type type() const { return INSERT_VALUE_ITEM; } /* We use RAND_TABLE_BIT to prevent Item_insert_value from being treated as a constant and precalculated before execution diff --git a/mysql-wsrep-5.6/sql/item_strfunc.cc b/mysql-wsrep-5.6/sql/item_strfunc.cc index 3c118195..81e7b4db 100644 --- a/mysql-wsrep-5.6/sql/item_strfunc.cc +++ b/mysql-wsrep-5.6/sql/item_strfunc.cc @@ -239,9 +239,9 @@ String *Item_func_sha2::val_str_ascii(String *str) size_t input_len; uint digest_length= 0; + input_string= args[0]->val_str(str); str->set_charset(&my_charset_bin); - input_string= args[0]->val_str(str); if (input_string == NULL) { null_value= TRUE; @@ -2192,6 +2192,11 @@ static int calculate_password(String *str, char *buffer) #if defined(HAVE_OPENSSL) if (old_passwords == 2) { + if (str->length() > MAX_PLAINTEXT_LENGTH) + { + my_error(ER_NOT_VALID_PASSWORD, MYF(0)); + return 0; + } my_make_scrambled_password(buffer, str->ptr(), str->length()); buffer_len= (int) strlen(buffer) + 1; @@ -2283,9 +2288,14 @@ char *Item_func_password:: #if defined(HAVE_OPENSSL) else { - /* Allocate memory for the password scramble and one extra byte for \0 */ - buff= (char *) thd->alloc(CRYPT_MAX_PASSWORD_SIZE + 1); - my_make_scrambled_password(buff, password, pass_len); + if (pass_len <= MAX_PLAINTEXT_LENGTH) + { + /* Allocate memory for the password scramble and one extra byte for \0 */ + buff= (char *) thd->alloc(CRYPT_MAX_PASSWORD_SIZE + 1); + my_make_scrambled_password(buff, password, pass_len); + } + else + my_error(ER_NOT_VALID_PASSWORD, MYF(0)); } #endif return buff; diff --git a/mysql-wsrep-5.6/sql/log_event.cc b/mysql-wsrep-5.6/sql/log_event.cc index 768c4484..d5185f30 100644 --- a/mysql-wsrep-5.6/sql/log_event.cc +++ b/mysql-wsrep-5.6/sql/log_event.cc @@ -4831,7 +4831,6 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli, thd->db, thd->db_length, thd->charset()); THD_STAGE_INFO(thd, stage_init); - MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi, thd->query(), thd->query_length()); if (thd->m_digest != NULL) thd->m_digest->reset(thd->m_token_array, max_digest_length); @@ -10776,7 +10775,11 @@ int Rows_log_event::do_hash_row(Relay_log_info const *rli) /* create an empty entry to add to the hash table */ HASH_ROW_ENTRY* entry= m_hash.make_entry(); - + if (entry == NULL) + { + error= 1; + goto end; + } /* Prepare the record, unpack and save positions. */ entry->positions->bi_start= m_curr_row; // save the bi start pos prepare_record(m_table, &m_cols, false); diff --git a/mysql-wsrep-5.6/sql/mysqld.cc b/mysql-wsrep-5.6/sql/mysqld.cc index 9511ce7e..6823263f 100644 --- a/mysql-wsrep-5.6/sql/mysqld.cc +++ b/mysql-wsrep-5.6/sql/mysqld.cc @@ -781,7 +781,9 @@ mysql_cond_t COND_wsrep_replaying; mysql_mutex_t LOCK_wsrep_slave_threads; mysql_mutex_t LOCK_wsrep_desync; int wsrep_replaying= 0; +ulong wsrep_running_threads = 0; // # of currently running wsrep threads static void wsrep_close_threads(THD* thd); +int mysqld_server_initialized= 0; #endif /* WITH_WSREP */ int mysqld_server_started= 0; @@ -1756,7 +1758,11 @@ static void __cdecl kill_server(int sig_ptr) } #endif #ifdef WITH_WSREP - if (WSREP_ON) wsrep_stop_replication(NULL); + /* Stop wsrep threads in case they are running. */ + if (wsrep_running_threads > 0) + { + wsrep_stop_replication(NULL); + } #endif close_connections(); @@ -5000,6 +5006,10 @@ a file name for --log-bin-index option", opt_binlog_index_name); after SST has happened */ } + + /* It's now safe to use thread specific memory */ + mysqld_server_initialized= 1; + if (!wsrep_recovery) { if (opt_bootstrap) // bootsrap option given - disable wsrep functionality @@ -5360,8 +5370,6 @@ static void create_shutdown_thread() #endif /* EMBEDDED_LIBRARY */ #ifdef WITH_WSREP -typedef void (*wsrep_thd_processor_fun)(THD *); - pthread_handler_t start_wsrep_THD(void *arg) { THD *thd; @@ -5434,6 +5442,11 @@ pthread_handler_t start_wsrep_THD(void *arg) thd->set_time(); thd->init_for_queries(); + mysql_mutex_lock(&LOCK_thread_count); + wsrep_running_threads++; + mysql_cond_broadcast(&COND_thread_count); + mysql_mutex_unlock(&LOCK_thread_count); + mysql_mutex_lock(&LOCK_connection_count); ++connection_count; mysql_mutex_unlock(&LOCK_connection_count); @@ -5442,6 +5455,12 @@ pthread_handler_t start_wsrep_THD(void *arg) close_connection(thd, 0, 1); + mysql_mutex_lock(&LOCK_thread_count); + wsrep_running_threads--; + WSREP_DEBUG("wsrep running threads now: %lu", wsrep_running_threads); + mysql_cond_broadcast(&COND_thread_count); + mysql_mutex_unlock(&LOCK_thread_count); + // Note: We can't call THD destructor without crashing // if plugins have not been initialized. However, in most of the // cases this means that pre SE initialization SST failed and @@ -5909,6 +5928,7 @@ int mysqld_main(int argc, char **argv) } #endif #ifdef WITH_WSREP + mysqld_server_initialized= 0; wsrep_filter_new_cluster (&argc, argv); #endif /* WITH_WSREP */ diff --git a/mysql-wsrep-5.6/sql/mysqld.h b/mysql-wsrep-5.6/sql/mysqld.h index cb58e689..006252dd 100644 --- a/mysql-wsrep-5.6/sql/mysqld.h +++ b/mysql-wsrep-5.6/sql/mysqld.h @@ -283,6 +283,9 @@ extern struct my_option my_long_early_options[]; int handle_early_options(); void adjust_related_options(ulong *requested_open_files); extern int mysqld_server_started; +#ifdef WITH_WSREP +extern int mysqld_server_initialized; +#endif /* WITH_WSREP */ extern "C" MYSQL_PLUGIN_IMPORT int orig_argc; extern "C" MYSQL_PLUGIN_IMPORT char **orig_argv; extern pthread_attr_t connection_attrib; @@ -798,6 +801,7 @@ extern const char *MY_BIND_ALL_ADDRESSES; #ifdef WITH_WSREP #include "my_pthread.h" +typedef void (*wsrep_thd_processor_fun)(THD *); pthread_handler_t start_wsrep_THD(void*); #endif /* WITH_WSREP */ diff --git a/mysql-wsrep-5.6/sql/opt_range.cc b/mysql-wsrep-5.6/sql/opt_range.cc index 87248f97..591beed4 100644 --- a/mysql-wsrep-5.6/sql/opt_range.cc +++ b/mysql-wsrep-5.6/sql/opt_range.cc @@ -11619,7 +11619,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree, double read_time) part of 'cur_index' */ if (bitmap_is_set(table->read_set, cur_field->field_index) && - !cur_field->is_part_of_actual_key(thd, cur_index)) + !cur_field->is_part_of_actual_key(thd, cur_index, cur_index_info)) { cause= "not_covering"; goto next_index; // Field was not part of key diff --git a/mysql-wsrep-5.6/sql/rpl_utility.cc b/mysql-wsrep-5.6/sql/rpl_utility.cc index a085c423..36758205 100644 --- a/mysql-wsrep-5.6/sql/rpl_utility.cc +++ b/mysql-wsrep-5.6/sql/rpl_utility.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1343,7 +1343,8 @@ HASH_ROW_ENTRY* Hash_slave_rows::make_entry(const uchar* bi_start, const uchar* HASH_ROW_PREAMBLE *preamble= (HASH_ROW_PREAMBLE *) my_malloc(sizeof(HASH_ROW_PREAMBLE), MYF(0)); HASH_ROW_POS *pos= (HASH_ROW_POS *) my_malloc(sizeof(HASH_ROW_POS), MYF(0)); - if (!entry || !preamble || !pos) + if (!entry || !preamble || !pos || + DBUG_EVALUATE_IF("fake_myalloc_failure",1, 0)) goto err; /** @@ -1372,7 +1373,7 @@ err: if (entry) my_free(entry); if (preamble) - my_free(entry); + my_free(preamble); if (pos) my_free(pos); DBUG_RETURN(NULL); diff --git a/mysql-wsrep-5.6/sql/sp_instr.cc b/mysql-wsrep-5.6/sql/sp_instr.cc index 5fc40854..664426ac 100644 --- a/mysql-wsrep-5.6/sql/sp_instr.cc +++ b/mysql-wsrep-5.6/sql/sp_instr.cc @@ -266,6 +266,35 @@ static bool subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str) // sp_lex_instr implementation. /////////////////////////////////////////////////////////////////////////// +class SP_instr_error_handler : public Internal_error_handler +{ +public: + SP_instr_error_handler() + : cts_table_exists_error(false) + {} + + virtual bool handle_condition(THD *thd, + uint sql_errno, + const char*, + Sql_condition::enum_warning_level, + const char*, + Sql_condition **) + { + /* + Check if the "table exists" error or warning reported for the + CREATE TABLE ... SELECT statement. + */ + if (thd->lex && thd->lex->sql_command == SQLCOM_CREATE_TABLE && + thd->lex->select_lex.item_list.elements > 0 && + sql_errno == ER_TABLE_EXISTS_ERROR) + cts_table_exists_error= true; + + return false; + } + + bool cts_table_exists_error; +}; + bool sp_lex_instr::reset_lex_and_exec_core(THD *thd, uint *nextp, @@ -327,6 +356,9 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd, reinit_stmt_before_use(thd, m_lex); + SP_instr_error_handler sp_instr_error_handler; + thd->push_internal_handler(&sp_instr_error_handler); + /* Open tables if needed. */ if (open_tables) @@ -400,6 +432,9 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd, DBUG_PRINT("info",("exec_core returned: %d", rc)); } + // Pop SP_instr_error_handler error handler. + thd->pop_internal_handler(); + if (m_lex->query_tables_own_last) { /* @@ -438,7 +473,8 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd, See Query_arena->state definition for explanation. Some special handling of CREATE TABLE .... SELECT in an SP is required. The - state is always set to STMT_INITIALIZED_FOR_SP in such a case. + state is set to STMT_INITIALIZED_FOR_SP even in case of "table exists" + error situation. Why is this necessary? A useful pointer would be to note how PREPARE/EXECUTE uses functions like select_like_stmt_test to implement @@ -454,12 +490,10 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd, */ bool reprepare_error= - rc && thd->get_stmt_da()->sql_errno() == ER_NEED_REPREPARE; - bool is_create_table_select= - thd->lex && thd->lex->sql_command == SQLCOM_CREATE_TABLE && - thd->lex->select_lex.item_list.elements > 0; + rc && thd->is_error() && + thd->get_stmt_da()->sql_errno() == ER_NEED_REPREPARE; - if (reprepare_error || is_create_table_select) + if (reprepare_error || sp_instr_error_handler.cts_table_exists_error) thd->stmt_arena->state= Query_arena::STMT_INITIALIZED_FOR_SP; else if (!rc || !thd->is_error() || (thd->get_stmt_da()->sql_errno() != ER_CANT_REOPEN_TABLE && diff --git a/mysql-wsrep-5.6/sql/spatial.cc b/mysql-wsrep-5.6/sql/spatial.cc index 0ffc4602..faa590ec 100644 --- a/mysql-wsrep-5.6/sql/spatial.cc +++ b/mysql-wsrep-5.6/sql/spatial.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1777,7 +1777,7 @@ bool Gis_multi_polygon::get_mbr(MBR *mbr, wkb_parser *wkb) const while (n_polygons--) { - uint32 n_linear_rings; + uint32 n_linear_rings= 0; if (wkb->skip_wkb_header() || wkb->scan_non_zero_uint4(&n_linear_rings)) return true; diff --git a/mysql-wsrep-5.6/sql/sql_acl.cc b/mysql-wsrep-5.6/sql/sql_acl.cc index 147bb4dd..117a7b1b 100644 --- a/mysql-wsrep-5.6/sql/sql_acl.cc +++ b/mysql-wsrep-5.6/sql/sql_acl.cc @@ -66,6 +66,10 @@ "$5$BVZy9O>'a+2MH]_?$fpWyabcdiHjfCVqId/quykZzjaA7adpkcen/uiQrtmOK4p4" #endif +#if defined(HAVE_OPENSSL) +#define SHA256_PASSWORD_MAX_PASSWORD_LENGTH MAX_PLAINTEXT_LENGTH +#endif /* HAVE_OPENSSL */ + using std::min; using std::max; @@ -5498,6 +5502,9 @@ int digest_password(THD *thd, LEX_USER *user_record) */ if (user_record->plugin.str == sha256_password_plugin_name.str) { + if (user_record->password.length > SHA256_PASSWORD_MAX_PASSWORD_LENGTH) + return 1; + char *buff= (char *) thd->alloc(CRYPT_MAX_PASSWORD_SIZE+1); if (buff == NULL) return 1; @@ -12663,6 +12670,9 @@ http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Proto #endif } // if(!my_vio_is_encrypter()) + if (pkt_len > SHA256_PASSWORD_MAX_PASSWORD_LENGTH + 1) + DBUG_RETURN(CR_ERROR); + /* A password was sent to an account without a password */ if (info->auth_string_length == 0) DBUG_RETURN(CR_ERROR); diff --git a/mysql-wsrep-5.6/sql/sql_digest.cc b/mysql-wsrep-5.6/sql/sql_digest.cc index 74223c63..b64d59ff 100644 --- a/mysql-wsrep-5.6/sql/sql_digest.cc +++ b/mysql-wsrep-5.6/sql/sql_digest.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -597,6 +597,8 @@ sql_digest_state* digest_add_token(sql_digest_state *state, } case 0: { + if (digest_storage->m_byte_count < SIZE_OF_A_TOKEN) + break; unsigned int temp_tok; read_token(digest_storage, digest_storage->m_byte_count-SIZE_OF_A_TOKEN, diff --git a/mysql-wsrep-5.6/sql/sql_insert.cc b/mysql-wsrep-5.6/sql/sql_insert.cc index 9d5315b2..d01ecfae 100644 --- a/mysql-wsrep-5.6/sql/sql_insert.cc +++ b/mysql-wsrep-5.6/sql/sql_insert.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1543,10 +1543,13 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, thd->abort_on_warning= saved_abort_on_warning; } - if (!res) + thd->lex->in_update_value_clause= true; + if (!res) res= setup_fields(thd, Ref_ptr_array(), update_values, MARK_COLUMNS_READ, 0, 0); + thd->lex->in_update_value_clause= false; + if (!res && duplic == DUP_UPDATE) { select_lex->no_wrap_view_item= TRUE; @@ -3556,13 +3559,18 @@ select_insert::prepare(List &values, SELECT_LEX_UNIT *u) We must make a single context out of the two separate name resolution contexts: the INSERT table and the tables in the SELECT part of INSERT ... SELECT. - To do that we must concatenate the two lists + To do that webcd + must concatenate the two lists */ table_list->next_name_resolution_table= ctx_state.get_first_name_resolution_table(); } + + thd->lex->in_update_value_clause= true; res= res || setup_fields(thd, Ref_ptr_array(), *update.update_values, MARK_COLUMNS_READ, 0, 0); + + thd->lex->in_update_value_clause= false; if (!res) { /* diff --git a/mysql-wsrep-5.6/sql/sql_lex.cc b/mysql-wsrep-5.6/sql/sql_lex.cc index 29ef1791..0c56ea5c 100644 --- a/mysql-wsrep-5.6/sql/sql_lex.cc +++ b/mysql-wsrep-5.6/sql/sql_lex.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3010,7 +3010,7 @@ void Query_tables_list::destroy_query_tables_list() LEX::LEX() :result(0), option_type(OPT_DEFAULT), is_change_password(false), - is_set_password_sql(false), is_lex_started(0) + is_set_password_sql(false), is_lex_started(0),in_update_value_clause(false) { my_init_dynamic_array2(&plugins, sizeof(plugin_ref), diff --git a/mysql-wsrep-5.6/sql/sql_lex.h b/mysql-wsrep-5.6/sql/sql_lex.h index 302b121a..2f8beec8 100644 --- a/mysql-wsrep-5.6/sql/sql_lex.h +++ b/mysql-wsrep-5.6/sql/sql_lex.h @@ -2545,6 +2545,8 @@ public: bool escape_used; bool is_lex_started; /* If lex_start() did run. For debugging. */ + /// Set to true while resolving values in ON DUPLICATE KEY UPDATE clause + bool in_update_value_clause; /* The set of those tables whose fields are referenced in all subqueries diff --git a/mysql-wsrep-5.6/sql/sql_optimizer.cc b/mysql-wsrep-5.6/sql/sql_optimizer.cc index 3cb0c2ae..93a600a7 100644 --- a/mysql-wsrep-5.6/sql/sql_optimizer.cc +++ b/mysql-wsrep-5.6/sql/sql_optimizer.cc @@ -2930,7 +2930,8 @@ static void update_depend_map(JOIN *join, ORDER *order) { table_map depend_map; order->item[0]->update_used_tables(); - order->depend_map=depend_map=order->item[0]->used_tables(); + order->depend_map= depend_map= + order->item[0]->used_tables() & ~PARAM_TABLE_BIT; order->used= 0; // Not item_sum(), RAND() and no reference to table outside of sub select if (!(order->depend_map & (OUTER_REF_TABLE_BIT | RAND_TABLE_BIT)) @@ -9068,6 +9069,7 @@ get_sort_by_table(ORDER *a,ORDER *b,TABLE_LIST *tables) DBUG_RETURN(0); map|=a->item[0]->used_tables(); } + map&= ~PARAM_TABLE_BIT; if (!map || (map & (RAND_TABLE_BIT | OUTER_REF_TABLE_BIT))) DBUG_RETURN(0); diff --git a/mysql-wsrep-5.6/sql/sql_parse.cc b/mysql-wsrep-5.6/sql/sql_parse.cc index 38301bdc..3ccd1388 100644 --- a/mysql-wsrep-5.6/sql/sql_parse.cc +++ b/mysql-wsrep-5.6/sql/sql_parse.cc @@ -1616,8 +1616,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd, thd->profiling.set_query_source(thd->query(), thd->query_length()); #endif - MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi, thd->query(), thd->query_length()); - Parser_state parser_state; if (parser_state.init(thd, thd->query(), thd->query_length())) break; @@ -1694,7 +1692,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd, thd->db, thd->db_length, thd->charset()); THD_STAGE_INFO(thd, stage_init); - MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi, beginning_of_next_stmt, length); thd->set_query_and_id(beginning_of_next_stmt, length, thd->charset(), next_query_id()); @@ -6395,10 +6392,11 @@ bool check_global_access(THD *thd, ulong want_access) /** Checks foreign key's parent table access. - @param thd [in] Thread handler - @param create_info [in] Create information (like MAX_ROWS, ENGINE or + @param thd [in] Thread handler + @param child_table_db [in] Database of child table + @param create_info [in] Create information (like MAX_ROWS, ENGINE or temporary table flag) - @param alter_info [in] Initial list of columns and indexes for the + @param alter_info [in] Initial list of columns and indexes for the table to be created @retval @@ -6407,6 +6405,7 @@ bool check_global_access(THD *thd, ulong want_access) true error or access denied. Error is sent to client in this case. */ bool check_fk_parent_table_access(THD *thd, + const char *child_table_db, HA_CREATE_INFO *create_info, Alter_info *alter_info) { @@ -6451,10 +6450,17 @@ bool check_fk_parent_table_access(THD *thd, if (fk_key->ref_db.str && check_and_convert_db_name(&db_name, false)) return true; } - else if (thd->lex->copy_db_to(&db_name.str, &db_name.length)) - return true; else + { + /* + If database name for parent table is not specified explicitly + SEs assume that it is the same as database name of child table. + We do the same here. + */ is_qualified_table_name= false; + db_name.str= const_cast(child_table_db); + db_name.length= strlen(child_table_db); + } // if lower_case_table_names is set then convert tablename to lower case. if (lower_case_table_names) @@ -7050,26 +7056,34 @@ void mysql_parse(THD *thd, char *rawbuf, uint length, if (!err) { /* - See whether we can do any query rewriting. opt_log_raw only controls - writing to the general log, so rewriting still needs to happen because - the other logs (binlog, slow query log, ...) can not be set to raw mode - for security reasons. + Rewrite the query for logging and for the Performance Schema statement + tables. Raw logging happened earlier. + Query-cache only handles SELECT, which we don't rewrite, so it's no concern of ours. - We're not general-logging if we're the slave, or if we've already - done raw-logging earlier. + Sub-routines of mysql_rewrite_query() should try to only rewrite when necessary (e.g. not do password obfuscation when query contains no - password), but we can optimize out even those necessary rewrites when - no logging happens at all. If rewriting does not happen here, - thd->rewritten_query is still empty from being reset in alloc_query(). + password). + + If rewriting does not happen here, thd->rewritten_query is still empty + from being reset in alloc_query(). */ - if (!(opt_log_raw || thd->slave_thread) || opt_slow_log || opt_bin_log) + mysql_rewrite_query(thd); + + if (thd->rewritten_query.length()) { - mysql_rewrite_query(thd); + lex->safe_to_cache_query= false; // see comments below - if (thd->rewritten_query.length()) - lex->safe_to_cache_query= false; // see comments below + MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi, + thd->rewritten_query.c_ptr_safe(), + thd->rewritten_query.length()); + } + else + { + MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi, + thd->query(), + thd->query_length()); } if (!(opt_log_raw || thd->slave_thread)) @@ -7089,15 +7103,15 @@ void mysql_parse(THD *thd, char *rawbuf, uint length, #ifndef NO_EMBEDDED_ACCESS_CHECKS if (mqh_used && thd->get_user_connect() && - check_mqh(thd, lex->sql_command)) + check_mqh(thd, lex->sql_command)) { - thd->net.error = 0; + thd->net.error = 0; } else #endif { - if (! thd->is_error()) - { + if (! thd->is_error()) + { /* Binlog logs a string starting from thd->query and having length thd->query_length; so we set thd->query_length correctly (to not @@ -7165,18 +7179,39 @@ void mysql_parse(THD *thd, char *rawbuf, uint length, error= gtid_empty_group_log_and_cleanup(thd); } MYSQL_QUERY_EXEC_DONE(error); - } + } } } else { + /* + Log the failed raw query in the Performance Schema. This statement did not + parse, so there is no way to tell if it may contain a password of not. + + The tradeoff is: + a) If we do log the query, a user typing by accident a broken query + containing a password will have the password exposed. This is very + unlikely, and this behavior can be documented. Remediation is to use + a new password when retyping the corrected query. + + b) If we do not log the query, finding broken queries in the client + application will be much more difficult. This is much more likely. + + Considering that broken queries can typically be generated by attempts at + SQL injection, finding the source of the SQL injection is critical, so the + design choice is to log the query text of broken queries (a). + */ + MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi, + thd->query(), + thd->query_length()); + /* Instrument this broken statement as "statement/sql/error" */ thd->m_statement_psi= MYSQL_REFINE_STATEMENT(thd->m_statement_psi, sql_statement_info[SQLCOM_END].m_key); DBUG_ASSERT(thd->is_error()); DBUG_PRINT("info",("Command aborted. Fatal_error: %d", - thd->is_fatal_error)); + thd->is_fatal_error)); query_cache_abort(&thd->query_cache_tls); } @@ -8712,7 +8747,8 @@ bool create_table_precheck(THD *thd, TABLE_LIST *tables, goto err; } - if (check_fk_parent_table_access(thd, &lex->create_info, &lex->alter_info)) + if (check_fk_parent_table_access(thd, create_table->db, + &lex->create_info, &lex->alter_info)) goto err; error= FALSE; diff --git a/mysql-wsrep-5.6/sql/sql_parse.h b/mysql-wsrep-5.6/sql/sql_parse.h index cae773cb..bac46e93 100644 --- a/mysql-wsrep-5.6/sql/sql_parse.h +++ b/mysql-wsrep-5.6/sql/sql_parse.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,6 +50,7 @@ bool insert_precheck(THD *thd, TABLE_LIST *tables); bool create_table_precheck(THD *thd, TABLE_LIST *tables, TABLE_LIST *create_table); bool check_fk_parent_table_access(THD *thd, + const char *child_table_db, HA_CREATE_INFO *create_info, Alter_info *alter_info); diff --git a/mysql-wsrep-5.6/sql/sql_show.cc b/mysql-wsrep-5.6/sql/sql_show.cc index 3219b995..12fa286e 100644 --- a/mysql-wsrep-5.6/sql/sql_show.cc +++ b/mysql-wsrep-5.6/sql/sql_show.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -7487,7 +7487,7 @@ bool get_schema_tables_result(JOIN *join, { JOIN_TAB *const tab= join->join_tab + i; if (!tab->table || !tab->table->pos_in_table_list) - break; + continue; TABLE_LIST *table_list= tab->table->pos_in_table_list; if (table_list->schema_table && thd->fill_information_schema_tables()) diff --git a/mysql-wsrep-5.6/sql/sql_table.cc b/mysql-wsrep-5.6/sql/sql_table.cc index 27891927..361dd817 100644 --- a/mysql-wsrep-5.6/sql/sql_table.cc +++ b/mysql-wsrep-5.6/sql/sql_table.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -8217,7 +8217,8 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, till this point for the alter operation. */ if ((alter_info->flags & Alter_info::ADD_FOREIGN_KEY) && - check_fk_parent_table_access(thd, create_info, alter_info)) + check_fk_parent_table_access(thd, alter_ctx.new_db, + create_info, alter_info)) DBUG_RETURN(true); /* diff --git a/mysql-wsrep-5.6/sql/table.cc b/mysql-wsrep-5.6/sql/table.cc index bfc7c13e..07ec7cdb 100644 --- a/mysql-wsrep-5.6/sql/table.cc +++ b/mysql-wsrep-5.6/sql/table.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4201,7 +4201,9 @@ bool TABLE_LIST::prep_check_option(THD *thd, uint8 check_opt_type) void TABLE_LIST::hide_view_error(THD *thd) { - if (thd->killed || thd->get_internal_handler()) + if (thd->killed || + (thd->lex->sql_command == SQLCOM_SHOW_CREATE && + thd->get_internal_handler())) return; /* Hide "Unknown column" or "Unknown function" error */ DBUG_ASSERT(thd->is_error()); diff --git a/mysql-wsrep-5.6/sql/unireg.cc b/mysql-wsrep-5.6/sql/unireg.cc index a96d5da8..d548c0ff 100644 --- a/mysql-wsrep-5.6/sql/unireg.cc +++ b/mysql-wsrep-5.6/sql/unireg.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -275,6 +275,25 @@ bool mysql_create_frm(THD *thd, const char *file_name, keybuff=(uchar*) my_malloc(key_buff_length, MYF(0)); key_info_length= pack_keys(keybuff, keys, key_info, data_offset); + /* key_info_length is currently stored in 2 bytes */ + if (key_info_length > 65535U) + { + char *real_table_name= (char*) table; + List_iterator it(create_fields); + Create_field *field; + while ((field=it++)) + { + if (field->field && field->field->table && + (real_table_name= field->field->table->s->table_name.str)) + break; + } + my_printf_error(ER_UNKNOWN_ERROR, + "Index information size for the table %s.%s exceeds the " + "maximum limit (Max: 2 bytes). Please recreate indexes " + "accordingly.", MYF(0), db, real_table_name); + goto err; + } + /* Ensure that there are no forms in this newly created form file. Even if the form file exists, create_frm must truncate it to diff --git a/mysql-wsrep-5.6/sql/wsrep_mysqld.h b/mysql-wsrep-5.6/sql/wsrep_mysqld.h index 2f64dc91..1266f064 100644 --- a/mysql-wsrep-5.6/sql/wsrep_mysqld.h +++ b/mysql-wsrep-5.6/sql/wsrep_mysqld.h @@ -100,6 +100,7 @@ extern my_bool wsrep_restart_slave; extern my_bool wsrep_restart_slave_activated; extern my_bool wsrep_slave_FK_checks; extern my_bool wsrep_slave_UK_checks; +extern ulong wsrep_running_threads; enum enum_wsrep_reject_types { WSREP_REJECT_NONE, /* nothing rejected */ diff --git a/mysql-wsrep-5.6/sql/wsrep_thd.cc b/mysql-wsrep-5.6/sql/wsrep_thd.cc index 8de76103..47b91f83 100644 --- a/mysql-wsrep-5.6/sql/wsrep_thd.cc +++ b/mysql-wsrep-5.6/sql/wsrep_thd.cc @@ -361,6 +361,26 @@ static void wsrep_replication_process(THD *thd) DBUG_VOID_RETURN; } +static bool create_wsrep_THD(wsrep_thd_processor_fun processor) +{ + ulong old_wsrep_running_threads= wsrep_running_threads; + pthread_t unused; + mysql_mutex_lock(&LOCK_thread_count); + bool res= pthread_create(&unused, &connection_attrib, start_wsrep_THD, + (void*)processor); + /* + if starting a thread on server startup, wait until this thread's THD + is fully initialized (otherwise a THD initialization code might + try to access a partially initialized server data structure - MDEV-8208). + (https://jira.mariadb.org/browse/MDEV-8208) + */ + if (!mysqld_server_initialized) + while (old_wsrep_running_threads == wsrep_running_threads) + mysql_cond_wait(&COND_thread_count, &LOCK_thread_count); + mysql_mutex_unlock(&LOCK_thread_count); + return res; +} + void wsrep_create_appliers(long threads) { if (!wsrep_connected) @@ -377,11 +397,8 @@ void wsrep_create_appliers(long threads) } long wsrep_threads=0; - pthread_t hThread; while (wsrep_threads++ < threads) { - if (pthread_create( - &hThread, &connection_attrib, - start_wsrep_THD, (void*)wsrep_replication_process)) + if (create_wsrep_THD(wsrep_replication_process)) WSREP_WARN("Can't create thread to manage wsrep replication"); } } @@ -469,10 +486,8 @@ void wsrep_create_rollbacker() { if (wsrep_provider && strcasecmp(wsrep_provider, "none")) { - pthread_t hThread; /* create rollbacker */ - if (pthread_create( &hThread, &connection_attrib, - start_wsrep_THD, (void*)wsrep_rollback_process)) + if (create_wsrep_THD(wsrep_rollback_process)) WSREP_WARN("Can't create thread to manage wsrep rollback"); } } diff --git a/mysql-wsrep-5.6/sql/wsrep_var.cc b/mysql-wsrep-5.6/sql/wsrep_var.cc index f32561d5..9d0ff56c 100644 --- a/mysql-wsrep-5.6/sql/wsrep_var.cc +++ b/mysql-wsrep-5.6/sql/wsrep_var.cc @@ -40,8 +40,6 @@ const char* wsrep_node_incoming_address = 0; const char* wsrep_start_position = 0; ulong wsrep_reject_queries; -static long wsrep_prev_slave_threads = wsrep_slave_threads; - int wsrep_init_vars() { wsrep_provider = my_strdup(WSREP_NONE, MYF(MY_WME)); @@ -539,8 +537,8 @@ void wsrep_node_address_init (const char* value) static void wsrep_slave_count_change_update () { - wsrep_slave_count_change += (wsrep_slave_threads - wsrep_prev_slave_threads); - wsrep_prev_slave_threads = wsrep_slave_threads; + // wsrep_running_threads = appliers threads + 1 rollbacker thread + wsrep_slave_count_change = (wsrep_slave_threads - wsrep_running_threads + 1); } bool wsrep_slave_threads_update (sys_var *self, THD* thd, enum_var_type type) diff --git a/mysql-wsrep-5.6/storage/innobase/CMakeLists.txt b/mysql-wsrep-5.6/storage/innobase/CMakeLists.txt index d612c3d8..56d064e1 100644 --- a/mysql-wsrep-5.6/storage/innobase/CMakeLists.txt +++ b/mysql-wsrep-5.6/storage/innobase/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -452,3 +452,5 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE DEFAULT MODULE_OUTPUT_NAME ha_innodb LINK_LIBRARIES ${ZLIB_LIBRARY}) + +ADD_DEPENDENCIES(innobase GenError) diff --git a/mysql-wsrep-5.6/storage/innobase/dict/dict0dict.cc b/mysql-wsrep-5.6/storage/innobase/dict/dict0dict.cc index b040bce0..a79d5a84 100644 --- a/mysql-wsrep-5.6/storage/innobase/dict/dict0dict.cc +++ b/mysql-wsrep-5.6/storage/innobase/dict/dict0dict.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. This program is free software; you can redistribute it and/or modify it under @@ -556,6 +556,8 @@ dict_table_close( indexes after an aborted online index creation */ { + + ibool drop_aborted; if (!dict_locked) { mutex_enter(&dict_sys->mutex); } @@ -563,6 +565,11 @@ dict_table_close( ut_ad(mutex_own(&dict_sys->mutex)); ut_a(table->n_ref_count > 0); + drop_aborted = try_drop + && table->drop_aborted + && table->n_ref_count == 1 + && dict_table_get_first_index(table); + --table->n_ref_count; /* Force persistent stats re-read upon next open of the table @@ -591,12 +598,6 @@ dict_table_close( if (!dict_locked) { table_id_t table_id = table->id; - ibool drop_aborted; - - drop_aborted = try_drop - && table->drop_aborted - && table->n_ref_count == 1 - && dict_table_get_first_index(table); mutex_exit(&dict_sys->mutex); @@ -2054,6 +2055,33 @@ dict_table_remove_from_cache_low( foreign->referenced_index = NULL; } + /* The check for dropped index should happen before we release + all the indexes */ + + if (lru_evict && table->drop_aborted) { + /* Do as dict_table_try_drop_aborted() does. */ + + trx_t* trx = trx_allocate_for_background(); + + ut_ad(mutex_own(&dict_sys->mutex)); +#ifdef UNIV_SYNC_DEBUG + ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX)); +#endif /* UNIV_SYNC_DEBUG */ + /* Mimic row_mysql_lock_data_dictionary(). */ + trx->dict_operation_lock_mode = RW_X_LATCH; + + trx_set_dict_operation(trx, TRX_DICT_OP_INDEX); + + /* Silence a debug assertion in row_merge_drop_indexes(). */ + ut_d(table->n_ref_count++); + row_merge_drop_indexes(trx, table, TRUE); + ut_d(table->n_ref_count--); + ut_ad(table->n_ref_count == 0); + trx_commit_for_mysql(trx); + trx->dict_operation_lock_mode = 0; + trx_free_for_background(trx); + } + /* Remove the indexes from the cache */ for (index = UT_LIST_GET_LAST(table->indexes); @@ -2086,30 +2114,6 @@ dict_table_remove_from_cache_low( dict_table_autoinc_store(table); } - if (lru_evict && table->drop_aborted) { - /* Do as dict_table_try_drop_aborted() does. */ - - trx_t* trx = trx_allocate_for_background(); - - ut_ad(mutex_own(&dict_sys->mutex)); -#ifdef UNIV_SYNC_DEBUG - ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX)); -#endif /* UNIV_SYNC_DEBUG */ - /* Mimic row_mysql_lock_data_dictionary(). */ - trx->dict_operation_lock_mode = RW_X_LATCH; - - trx_set_dict_operation(trx, TRX_DICT_OP_INDEX); - - /* Silence a debug assertion in row_merge_drop_indexes(). */ - ut_d(table->n_ref_count++); - row_merge_drop_indexes(trx, table, TRUE); - ut_d(table->n_ref_count--); - ut_ad(table->n_ref_count == 0); - trx_commit_for_mysql(trx); - trx->dict_operation_lock_mode = 0; - trx_free_for_background(trx); - } - size = mem_heap_get_size(table->heap) + strlen(table->name) + 1; ut_ad(dict_sys->size >= size); diff --git a/mysql-wsrep-5.6/storage/innobase/dict/dict0mem.cc b/mysql-wsrep-5.6/storage/innobase/dict/dict0mem.cc index b39e1e17..f5bfd49e 100644 --- a/mysql-wsrep-5.6/storage/innobase/dict/dict0mem.cc +++ b/mysql-wsrep-5.6/storage/innobase/dict/dict0mem.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. This program is free software; you can redistribute it and/or modify it under @@ -300,11 +300,20 @@ dict_mem_table_col_rename_low( char* col_names; if (to_len > from_len) { + ulint table_size_before_rename_col + = mem_heap_get_size(table->heap); col_names = static_cast( mem_heap_alloc( table->heap, full_len + to_len - from_len)); - + ulint table_size_after_rename_col + = mem_heap_get_size(table->heap); + if (table_size_before_rename_col + != table_size_after_rename_col) { + dict_sys->size += + table_size_after_rename_col + - table_size_before_rename_col; + } memcpy(col_names, table->col_names, prefix_len); } else { col_names = const_cast(table->col_names); diff --git a/mysql-wsrep-5.6/storage/innobase/fts/fts0fts.cc b/mysql-wsrep-5.6/storage/innobase/fts/fts0fts.cc index a29e046e..f3fa6e52 100644 --- a/mysql-wsrep-5.6/storage/innobase/fts/fts0fts.cc +++ b/mysql-wsrep-5.6/storage/innobase/fts/fts0fts.cc @@ -4804,9 +4804,17 @@ fts_process_token( t_str.f_str = static_cast( mem_heap_alloc(heap, t_str.f_len)); - newlen = innobase_fts_casedn_str( - doc->charset, (char*) str.f_str, str.f_len, - (char*) t_str.f_str, t_str.f_len); + /* For binary collations, a case sensitive search is + performed. Hence don't convert to lower case. */ + if (my_binary_compare(result_doc->charset)) { + memcpy(t_str.f_str, str.f_str, str.f_len); + t_str.f_str[str.f_len]= 0; + newlen= str.f_len; + } else { + newlen = innobase_fts_casedn_str( + doc->charset, (char*) str.f_str, str.f_len, + (char*) t_str.f_str, t_str.f_len); + } t_str.f_len = newlen; t_str.f_str[newlen] = 0; diff --git a/mysql-wsrep-5.6/storage/innobase/fts/fts0que.cc b/mysql-wsrep-5.6/storage/innobase/fts/fts0que.cc index fd1199ac..d20ff345 100644 --- a/mysql-wsrep-5.6/storage/innobase/fts/fts0que.cc +++ b/mysql-wsrep-5.6/storage/innobase/fts/fts0que.cc @@ -3764,10 +3764,19 @@ fts_query_str_preprocess( str_len = query_len * charset->casedn_multiply + 1; str_ptr = static_cast(ut_malloc(str_len)); - *result_len = innobase_fts_casedn_str( - charset, const_cast(reinterpret_cast( - query_str)), query_len, - reinterpret_cast(str_ptr), str_len); + /* For binary collations, a case sensitive search is + performed. Hence don't convert to lower case. */ + if (my_binary_compare(charset)) { + memcpy(str_ptr, query_str, query_len); + str_ptr[query_len]= 0; + *result_len= query_len; + } else { + *result_len = innobase_fts_casedn_str( + charset, const_cast + (reinterpret_cast( query_str)), + query_len, + reinterpret_cast(str_ptr), str_len); + } ut_ad(*result_len < str_len); diff --git a/mysql-wsrep-5.6/storage/innobase/handler/ha_innodb.cc b/mysql-wsrep-5.6/storage/innobase/handler/ha_innodb.cc index 3ddfc9ae..8ff96581 100644 --- a/mysql-wsrep-5.6/storage/innobase/handler/ha_innodb.cc +++ b/mysql-wsrep-5.6/storage/innobase/handler/ha_innodb.cc @@ -3540,6 +3540,14 @@ innobase_change_buffering_inited_ok: /* Turn on monitor counters that are default on */ srv_mon_default_on(); +#ifndef UNIV_HOTBACKUP +#ifdef _WIN32 + if (ut_win_init_time()) { + goto mem_free_and_error; + } +#endif /* _WIN32 */ +#endif /* !UNIV_HOTBACKUP */ + DBUG_RETURN(FALSE); error: DBUG_RETURN(TRUE); diff --git a/mysql-wsrep-5.6/storage/innobase/include/ut0ut.h b/mysql-wsrep-5.6/storage/innobase/include/ut0ut.h index ef887ed5..7c28081d 100644 --- a/mysql-wsrep-5.6/storage/innobase/include/ut0ut.h +++ b/mysql-wsrep-5.6/storage/innobase/include/ut0ut.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -266,6 +266,15 @@ UNIV_INTERN ulint ut_time_ms(void); /*============*/ +#ifdef _WIN32 +/**********************************************************//** +Initialise highest available time resolution API on Windows +@return 0 if all OK else -1 */ +int +ut_win_init_time(); + +#endif /* _WIN32 */ + #endif /* !UNIV_HOTBACKUP */ /**********************************************************//** diff --git a/mysql-wsrep-5.6/storage/innobase/row/row0sel.cc b/mysql-wsrep-5.6/storage/innobase/row/row0sel.cc index bd311a99..706b5436 100644 --- a/mysql-wsrep-5.6/storage/innobase/row/row0sel.cc +++ b/mysql-wsrep-5.6/storage/innobase/row/row0sel.cc @@ -2796,7 +2796,7 @@ row_sel_store_mysql_field_func( { const byte* data; ulint len; - ulint clust_field_no; + ulint clust_field_no = 0; bool clust_templ_for_sec = (sec_field_no != ULINT_UNDEFINED); ut_ad(prebuilt->default_rec); diff --git a/mysql-wsrep-5.6/storage/innobase/trx/trx0purge.cc b/mysql-wsrep-5.6/storage/innobase/trx/trx0purge.cc index 55af5499..35f4127a 100644 --- a/mysql-wsrep-5.6/storage/innobase/trx/trx0purge.cc +++ b/mysql-wsrep-5.6/storage/innobase/trx/trx0purge.cc @@ -579,6 +579,7 @@ trx_purge_rseg_get_next_history_log( mutex_exit(&(rseg->mutex)); mtr_commit(&mtr); +#ifdef UNIV_DEBUG mutex_enter(&trx_sys->mutex); /* Add debug code to track history list corruption reported @@ -595,15 +596,19 @@ trx_purge_rseg_get_next_history_log( " InnoDB: Warning: purge reached the" " head of the history list,\n" "InnoDB: but its length is still" - " reported as %lu! Make a detailed bug\n" - "InnoDB: report, and submit it" - " to http://bugs.mysql.com\n", + " reported as %lu!.\n" + "This can happen for multiple reasons\n" + "1. A long running transaction is" + " withholding purging of undo logs or a read" + " view is open. Please try to commit the long" + " running transaction.\n" + "2. Try increasing the number of purge" + " threads to expedite purging of undo logs.", (ulong) trx_sys->rseg_history_len); - ut_ad(0); } mutex_exit(&trx_sys->mutex); - +#endif return; } diff --git a/mysql-wsrep-5.6/storage/innobase/ut/ut0ut.cc b/mysql-wsrep-5.6/storage/innobase/ut/ut0ut.cc index 68446cc8..82979b5b 100644 --- a/mysql-wsrep-5.6/storage/innobase/ut/ut0ut.cc +++ b/mysql-wsrep-5.6/storage/innobase/ut/ut0ut.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -48,6 +48,10 @@ Created 5/11/1994 Heikki Tuuri UNIV_INTERN ibool ut_always_false = FALSE; #ifdef __WIN__ +#include /* For sql_print_error */ +typedef VOID(WINAPI *time_fn)(LPFILETIME); +static time_fn ut_get_system_time_as_file_time = GetSystemTimeAsFileTime; + /*****************************************************************//** NOTE: The Windows epoch starts from 1601/01/01 whereas the Unix epoch starts from 1970/1/1. For selection of constant see: @@ -55,6 +59,28 @@ http://support.microsoft.com/kb/167296/ */ #define WIN_TO_UNIX_DELTA_USEC ((ib_int64_t) 11644473600000000ULL) +/** +Initialise highest available time resolution API on Windows +@return 0 if all OK else -1 */ +int +ut_win_init_time() +{ + HMODULE h = LoadLibrary("kernel32.dll"); + if (h != NULL) + { + time_fn pfn = (time_fn)GetProcAddress(h, "GetSystemTimePreciseAsFileTime"); + if (pfn != NULL) + { + ut_get_system_time_as_file_time = pfn; + } + return false; + } + DWORD error = GetLastError(); + sql_print_error( + "LoadLibrary(\"kernel32.dll\") failed: GetLastError returns %lu", error); + return(-1); +} + /*****************************************************************//** This is the Windows version of gettimeofday(2). @return 0 if all OK else -1 */ @@ -73,7 +99,7 @@ ut_gettimeofday( return(-1); } - GetSystemTimeAsFileTime(&ft); + ut_get_system_time_as_file_time(&ft); tm = (ib_int64_t) ft.dwHighDateTime << 32; tm |= ft.dwLowDateTime; diff --git a/mysql-wsrep-5.6/storage/myisam/mi_locking.c b/mysql-wsrep-5.6/storage/myisam/mi_locking.c index 8f64f570..7fb4e0e8 100644 --- a/mysql-wsrep-5.6/storage/myisam/mi_locking.c +++ b/mysql-wsrep-5.6/storage/myisam/mi_locking.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -103,6 +103,8 @@ int mi_lock_database(MI_INFO *info, int lock_type) share->changed=0; if (myisam_flush) { + if (share->file_map) + my_msync(info->dfile, share->file_map, share->mmaped_length, MS_SYNC); if (mysql_file_sync(share->kfile, MYF(0))) error= my_errno; if (mysql_file_sync(info->dfile, MYF(0))) @@ -450,6 +452,8 @@ int _mi_writeinfo(register MI_INFO *info, uint operation) #ifdef _WIN32 if (myisam_flush) { + if (share->file_map) + my_msync(info->dfile, share->file_map, share->mmaped_length, MS_SYNC); mysql_file_sync(share->kfile, 0); mysql_file_sync(info->dfile, 0); } diff --git a/mysql-wsrep-5.6/support-files/mysql.spec.sh b/mysql-wsrep-5.6/support-files/mysql.spec.sh index e6301ce6..6d9e1f58 100644 --- a/mysql-wsrep-5.6/support-files/mysql.spec.sh +++ b/mysql-wsrep-5.6/support-files/mysql.spec.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -847,7 +847,13 @@ install -m 644 "%{malloc_lib_source}" \ # Remove man pages we explicitly do not want to package, avoids 'unpackaged # files' warning. -# This has become obsolete: rm -f $RBR%%{_mandir}/man1/make_win_bin_dist.1* +# This has become obsolete: rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1* +rm -f $RBR%{_mandir}/man1/mysql-stress-test.pl.1 +rm -f $RBR%{_mandir}/man1/mysql-test-run.pl.1 +rm -f $RBR%{_mandir}/man1/mysql_client_test.1 +rm -f $RBR%{_mandir}/man1/mysql_client_test_embedded.1 +rm -f $RBR%{_mandir}/man1/mysqltest.1 +rm -f $RBR%{_mandir}/man1/mysqltest_embedded.1 %check @@ -1334,7 +1340,6 @@ echo "=====" >> $STATUS_HISTORY %doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1* @@ -1496,11 +1501,6 @@ echo "=====" >> $STATUS_HISTORY %endif %attr(-, root, root) %{_datadir}/mysql-test %attr(755, root, root) %{_bindir}/mysql_client_test -%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql-test-run.pl.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test_embedded.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1* ############################################################################## # The spec file changelog only includes changes made to the spec file @@ -1508,6 +1508,9 @@ echo "=====" >> $STATUS_HISTORY # merging BK trees) ############################################################################## %changelog +* Tue Oct 31 2017 Bjorn Munch +- Remove obsoleted mysqltest man pages + * Fri Jun 10 2016 Joerg Bruehe - Add missing "obsoletes" directives to handle Oracle's yum repository. - Fix comment about SO version of libmysqlclient.so.