diff options
Diffstat (limited to 'databases/mysql80-server/files')
| -rw-r--r-- | databases/mysql80-server/files/patch-client_CMakeLists.txt | 18 | ||||
| -rw-r--r-- | databases/mysql80-server/files/patch-icu68 | 17 | ||||
| -rw-r--r-- | databases/mysql80-server/files/patch-mysys_my__default.cc | 20 | ||||
| -rw-r--r-- | databases/mysql80-server/files/patch-sql_binlog.cc | 24 | ||||
| -rw-r--r-- | databases/mysql80-server/files/patch-sql_item.h | 18 |
5 files changed, 44 insertions, 53 deletions
diff --git a/databases/mysql80-server/files/patch-client_CMakeLists.txt b/databases/mysql80-server/files/patch-client_CMakeLists.txt index b037a4de28bb..bbfb4249c799 100644 --- a/databases/mysql80-server/files/patch-client_CMakeLists.txt +++ b/databases/mysql80-server/files/patch-client_CMakeLists.txt @@ -1,18 +1,20 @@ ---- client/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +--- client/CMakeLists.txt.orig 2021-03-22 08:44:50 UTC +++ client/CMakeLists.txt -@@ -28,8 +28,11 @@ DISABLE_MISSING_PROFILE_WARNING() +@@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING() ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) ## Subdirectory for mysqlpump code. +IF(WITHOUT_SERVER) ADD_SUBDIRECTORY(dump) + ## Subdirectory for mysql_migrate_keyring code. + ADD_SUBDIRECTORY(migrate_keyring) +ENDIF() +IF(NOT WITHOUT_CLIENTLIBS) MYSQL_ADD_EXECUTABLE(mysql ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc completion_hash.cc -@@ -39,6 +42,7 @@ MYSQL_ADD_EXECUTABLE(mysql +@@ -41,6 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysql client_query_attributes.cc LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY} ) @@ -20,7 +22,7 @@ IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -55,6 +59,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND +@@ -57,6 +61,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND ) ENDIF() @@ -28,7 +30,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc mysqltest/error_names.cc -@@ -71,6 +76,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest +@@ -73,6 +78,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest ENABLE_EXPORTS LINK_LIBRARIES mysqlclient ) @@ -38,7 +40,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc check/mysqlcheck_core.cc -@@ -246,7 +254,9 @@ ENDIF() +@@ -248,7 +256,9 @@ ENDIF() TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX) TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql) @@ -48,7 +50,7 @@ MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc LINK_LIBRARIES mysqlclient -@@ -259,6 +269,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor +@@ -261,6 +271,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc LINK_LIBRARIES mysqlclient ) @@ -58,7 +60,7 @@ MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc LINK_LIBRARIES mysqlclient -@@ -269,6 +282,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup +@@ -271,6 +284,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup path.cc LINK_LIBRARIES mysys ) diff --git a/databases/mysql80-server/files/patch-icu68 b/databases/mysql80-server/files/patch-icu68 deleted file mode 100644 index 89f0f9b4a54b..000000000000 --- a/databases/mysql80-server/files/patch-icu68 +++ /dev/null @@ -1,17 +0,0 @@ -Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 - -sql/mysqld.cc:6915:30: error: use of undeclared identifier 'TRUE' - my_getopt_skip_unknown = TRUE; - ^ - ---- sql/mysqld.cc.orig 2020-06-16 16:31:03 UTC -+++ sql/mysqld.cc -@@ -6910,7 +6912,7 @@ int mysqld_main(int argc, char **argv) - if (opt_keyring_migration_source || opt_keyring_migration_destination || - migrate_connect_options) { - Migrate_keyring mk; -- my_getopt_skip_unknown = TRUE; -+ my_getopt_skip_unknown = true; - if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source, - opt_keyring_migration_destination, opt_keyring_migration_user, - opt_keyring_migration_host, opt_keyring_migration_password, diff --git a/databases/mysql80-server/files/patch-mysys_my__default.cc b/databases/mysql80-server/files/patch-mysys_my__default.cc index ffc76b7a8941..6a8cb5ebbaf2 100644 --- a/databases/mysql80-server/files/patch-mysys_my__default.cc +++ b/databases/mysql80-server/files/patch-mysys_my__default.cc @@ -1,15 +1,15 @@ ---- mysys/my_default.cc.orig 2019-09-20 08:30:51 UTC +--- mysys/my_default.cc.orig 2021-04-23 15:06:40 UTC +++ mysys/my_default.cc -@@ -203,7 +203,7 @@ bool no_defaults = false; +@@ -204,7 +204,7 @@ bool no_defaults = false; /* Which directories are searched for options (and in which order) */ -#define MAX_DEFAULT_DIRS 6 +#define MAX_DEFAULT_DIRS 7 #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; + static const char **default_directories = nullptr; -@@ -909,6 +909,14 @@ static int search_default_file_with_ext(Process_option +@@ -915,6 +915,14 @@ static int search_default_file_with_ext(Process_option return 1; /* Ignore wrong files */ } @@ -21,10 +21,10 @@ + goto err; + } + - while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) { - line++; - /* Ignore comment and empty lines */ -@@ -1228,7 +1236,8 @@ void my_print_default_files(const char *conf_file) { + while (true) { + auto fileline = mysql_file_getline(buff, sizeof(buff), fp, is_login_file); + char *linebuff = fileline.get(); +@@ -1300,7 +1308,8 @@ void my_print_default_files(const char *conf_file) { end[(strlen(end) - 1)] = ' '; else strxmov(end, conf_file, *ext, " ", NullS); @@ -34,7 +34,7 @@ } } } -@@ -1565,14 +1574,9 @@ static const char **init_default_directories(MEM_ROOT +@@ -1640,14 +1649,9 @@ static const char **init_default_directories(MEM_ROOT #else @@ -51,7 +51,7 @@ #endif if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs); -@@ -1635,7 +1639,7 @@ int check_file_permissions(const char *file_name, bool +@@ -1710,7 +1714,7 @@ int check_file_permissions(const char *file_name, bool #if !defined(_WIN32) MY_STAT stat_info; diff --git a/databases/mysql80-server/files/patch-sql_binlog.cc b/databases/mysql80-server/files/patch-sql_binlog.cc new file mode 100644 index 000000000000..6c51f7bf8a61 --- /dev/null +++ b/databases/mysql80-server/files/patch-sql_binlog.cc @@ -0,0 +1,24 @@ +--- sql/binlog.cc.orig 2021-03-22 08:44:50 UTC ++++ sql/binlog.cc +@@ -9156,8 +9156,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids( + + char *missing_gtids = NULL; + char *slave_executed_gtids = NULL; +- gtid_missing.to_string(&missing_gtids, NULL); +- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL); ++ gtid_missing.to_string(&missing_gtids); ++ slave_executed_gtid_set->to_string(&slave_executed_gtids); + + /* + Log the information about the missing purged GTIDs to the error log. +@@ -9210,8 +9210,8 @@ void MYSQL_BIN_LOG::report_missing_gtids( + Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map()); + gtid_missing.add_gtid_set(slave_executed_gtid_set); + gtid_missing.remove_gtid_set(previous_gtid_set); +- gtid_missing.to_string(&missing_gtids, NULL); +- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL); ++ gtid_missing.to_string(&missing_gtids); ++ slave_executed_gtid_set->to_string(&slave_executed_gtids); + + String tmp_uuid; + diff --git a/databases/mysql80-server/files/patch-sql_item.h b/databases/mysql80-server/files/patch-sql_item.h deleted file mode 100644 index ebeed4aaa6b7..000000000000 --- a/databases/mysql80-server/files/patch-sql_item.h +++ /dev/null @@ -1,18 +0,0 @@ ---- sql/item.h.orig 2020-12-11 07:42:20 UTC -+++ sql/item.h -@@ -3380,13 +3380,13 @@ class Item_sp_variable : public Item { - Name_string m_name; - - public: --#ifndef DBUG_OFF -+//#ifndef DBUG_OFF - /* - Routine to which this Item_splocal belongs. Used for checking if correct - runtime context is used for variable handling. - */ - sp_head *m_sp{nullptr}; --#endif -+//#endif - - public: - Item_sp_variable(const Name_string sp_var_name); |