summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2020-12-11 20:23:54 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2020-12-11 20:25:14 +0000
commitc179c45fef7f5bf5c754a1b6c0ecc3377ec97d44 (patch)
treee7ad575960aa183f0258cb8dea8ce723cc53694e /dev-db
parentFix highlight-3 patch paths (diff)
downloadpatches-c179c45fef7f5bf5c754a1b6c0ecc3377ec97d44.tar.bz2
patches-c179c45fef7f5bf5c754a1b6c0ecc3377ec97d44.tar.xz
patches-c179c45fef7f5bf5c754a1b6c0ecc3377ec97d44.zip
mysql-8.0.21-icu-68.1.patch
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mysql/mysql-8.0.21-icu-68.1.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/dev-db/mysql/mysql-8.0.21-icu-68.1.patch b/dev-db/mysql/mysql-8.0.21-icu-68.1.patch
new file mode 100644
index 0000000..be7a27e
--- /dev/null
+++ b/dev-db/mysql/mysql-8.0.21-icu-68.1.patch
@@ -0,0 +1,41 @@
+diff -urNp mysql-orig/sql/mysqld.cc mysql-dwok/sql/mysqld.cc
+--- mysql-orig/sql/mysqld.cc 2020-12-09 17:31:52.696925139 +0100
++++ mysql-dwok/sql/mysqld.cc 2020-12-09 17:32:59.401936084 +0100
+@@ -6369,7 +6369,7 @@ extern "C" void *handle_shutdown_and_res
+ /* This call should create the message queue for this thread. */
+ PeekMessage(&msg, NULL, 1, 65534, PM_NOREMOVE);
+ DWORD ret_code = WaitForMultipleObjects(
+- 2, static_cast<HANDLE *>(event_handles), FALSE, INFINITE);
++ 2, static_cast<HANDLE *>(event_handles), false, INFINITE);
+
+ if (ret_code == WAIT_OBJECT_0 || ret_code == WAIT_OBJECT_0 + 1) {
+ if (ret_code == WAIT_OBJECT_0)
+@@ -6401,8 +6401,8 @@ static void create_shutdown_and_restart_
+ }
+
+ hEventShutdown =
+- CreateEvent(shutdown_sec_attr, FALSE, FALSE, shutdown_event_name);
+- hEventRestart = CreateEvent(0, FALSE, FALSE, restart_event_name);
++ CreateEvent(shutdown_sec_attr, false, false, shutdown_event_name);
++ hEventRestart = CreateEvent(0, false, false, restart_event_name);
+
+ my_thread_attr_init(&thr_attr);
+
+@@ -6988,7 +6988,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,
+@@ -11600,7 +11600,7 @@ bool update_named_pipe_full_access_group
+
+ @return a bool indicating partial_revokes status of the server.
+ @retval true Parital revokes is ON
+- @retval flase Partial revokes is OFF
++ @retval false Partial revokes is OFF
+ */
+ bool mysqld_partial_revokes() {
+ return partial_revokes.load(std::memory_order_relaxed);