summaryrefslogtreecommitdiff
path: root/databases/mysql80-server/files/patch-mysys_my__default.cc
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql80-server/files/patch-mysys_my__default.cc')
-rw-r--r--databases/mysql80-server/files/patch-mysys_my__default.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/databases/mysql80-server/files/patch-mysys_my__default.cc b/databases/mysql80-server/files/patch-mysys_my__default.cc
index 6e479597e24a..87b603301f41 100644
--- a/databases/mysql80-server/files/patch-mysys_my__default.cc
+++ b/databases/mysql80-server/files/patch-mysys_my__default.cc
@@ -1,5 +1,5 @@
---- mysys/my_default.cc.orig 2021-11-02 20:29:18.337621000 +0100
-+++ mysys/my_default.cc 2021-11-02 20:57:11.624299000 +0100
+--- mysys/my_default.cc.orig 2021-12-17 16:07:27 UTC
++++ mysys/my_default.cc
@@ -204,7 +204,7 @@ bool no_defaults = false;
/* Which directories are searched for options (and in which order) */
@@ -24,7 +24,7 @@
while (true) {
auto fileline = mysql_file_getline(buff, sizeof(buff), fp, is_login_file);
char *linebuff = fileline.get();
-@@ -1315,7 +1323,8 @@ void my_print_default_files(const char *conf_file) {
+@@ -1311,7 +1319,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 @@
}
}
}
-@@ -1655,14 +1664,9 @@ static const char **init_default_directories(MEM_ROOT
+@@ -1651,14 +1660,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);
-@@ -1727,7 +1731,7 @@ int check_file_permissions(const char *file_name, bool
+@@ -1723,7 +1727,7 @@ int check_file_permissions(const char *file_name, bool
#if !defined(_WIN32)
MY_STAT stat_info;