Skip to content

M
MariaDB
Commit efce59fc authored by hf@deer.(none)'s avatar hf@deer.(none)
Browse files
Options

Monty's merge bug fixed

parent c477002f
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
libmysqld/lib_sql.cc
View file @ efce59fc
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
static int fake_argc= 1; static int fake_argc= 1;
static char *fake_argv[]= {(char *)"", 0}; static char *fake_argv[]= {(char *)"", 0};
static const char *fake_groups[] = { "server", "embedded", 0 }; static const char *fake_groups[] = { "server", "embedded", 0 };
static my_bool org_my_init_done;
my_bool server_inited;
#if defined (__WIN__) #if defined (__WIN__)
#include "../sql/mysqld.cpp" #include "../sql/mysqld.cpp"
...@@ -41,6 +39,9 @@ C_MODE_START ...@@ -41,6 +39,9 @@ C_MODE_START
#include "errmsg.h" #include "errmsg.h"
#include <sql_common.h> #include <sql_common.h>
static my_bool org_my_init_done;
my_bool server_inited;
static int check_connections1(THD * thd); static int check_connections1(THD * thd);
static int check_connections2(THD * thd); static int check_connections2(THD * thd);
static bool check_user(THD *thd, enum_server_command command, static bool check_user(THD *thd, enum_server_command command,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7