diff options
| author | tim@black.box <> | 2001-08-10 12:37:36 -0400 |
|---|---|---|
| committer | tim@black.box <> | 2001-08-10 12:37:36 -0400 |
| commit | a1a834a650fe8956d13d6e16c447c5c4de75df5c (patch) | |
| tree | 0b1bf2d0aed5c3d69b112448bb146dcc526f9890 /libmysqld/libmysqld.c | |
| parent | d9737f20f838f189ef1f3d25df7739770f3b52b9 (diff) | |
| download | mariadb-git-a1a834a650fe8956d13d6e16c447c5c4de75df5c.tar.gz | |
Embedded mysql fixes.
There is now a mysql_server_init() function which needs to be
called at the beginning of the program (and _end() for the end
of the program). This routine handles argument parsing for the
embedded server.
Use the embedded version of mysql_load_file() (ignore the LOCAL
argument, since the client and server are the same program).
There are now mysql_thread_init/end() functions for the client
to use in a multi-threaded app. They are just wrappers for
my_thread_init/end().
Diffstat (limited to 'libmysqld/libmysqld.c')
| -rw-r--r-- | libmysqld/libmysqld.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 216261e220d..0e66ceb2f40 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -75,14 +75,12 @@ my_string mysql_unix_port=0; #endif /* XXX: this is real ugly... */ -static void mysql_once_init(void); -extern void embedded_srv_init(void); -extern void embedded_srv_deinit(void); extern void start_embedded_connection(NET * net); extern void lib_connection_phase(NET *net, int phase); extern bool lib_dispatch_command(enum enum_server_command command, NET *net, const char *arg, ulong length); +static void mysql_once_init(void); static MYSQL_DATA *read_rows (MYSQL *mysql,MYSQL_FIELD *fields, uint field_count); static int read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, @@ -791,10 +789,8 @@ static void mysql_once_init() { mysql_client_init=1; my_init(); /* Will init threads */ - embedded_srv_init(); init_client_errs(); mysql_port = MYSQL_PORT; - DEBUGGER_ON; mysql_debug(NullS); } #ifdef THREAD |