Monty's merge bug fixed

libmysqld/lib_sql.cc:
  these definitions moved to be after my_bool declaration
This commit is contained in:
unknown 2003-09-12 13:44:41 +05:00
parent 32a4e783c3
commit 11930efba6

View File

@ -26,8 +26,6 @@
static int fake_argc= 1;
static char *fake_argv[]= {(char *)"", 0};
static const char *fake_groups[] = { "server", "embedded", 0 };
static my_bool org_my_init_done;
my_bool server_inited;
#if defined (__WIN__)
#include "../sql/mysqld.cpp"
@ -41,6 +39,9 @@ C_MODE_START
#include "errmsg.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_connections2(THD * thd);
static bool check_user(THD *thd, enum_server_command command,