diff options
author | unknown <tim@black.box> | 2001-08-10 12:37:36 -0400 |
---|---|---|
committer | unknown <tim@black.box> | 2001-08-10 12:37:36 -0400 |
commit | b538ff90dad25d5975b68182bd064bc7a95ebfc2 (patch) | |
tree | 0b1bf2d0aed5c3d69b112448bb146dcc526f9890 /sql/mysqld.cc | |
parent | 4bb40187438bdfb8b1d8b091399bd01e0e3425c1 (diff) | |
download | mariadb-git-b538ff90dad25d5975b68182bd064bc7a95ebfc2.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().
BitKeeper/deleted/.del-README~434e9cae5fa9a4c4:
Delete: libmysqld/README
libmysqld/lib_load.cc:
minor cleanup
include/mysql.h:
add mysql_server/thread_init/end()
libmysql/libmysql.c:
add mysql_server/thread_init/end()
libmysqld/lib_sql.cc:
add mysql_server/thread_init/end()
libmysqld/libmysqld.c:
add mysql_server/thread_init/end()
sql/mysqld.cc:
allow get_options() to be called more than once
libmysqld/Makefile.am:
use lib_load.cc instead of sql_load.cc
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index dad4a1c2427..199c9de9e88 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3263,6 +3263,7 @@ static void get_options(int argc,char **argv) myisam_delay_key_write=1; // Allow use of this my_use_symdir=1; // Use internal symbolic links + optind = 0; // setup in case getopt() was called previously while ((c=getopt_long(argc,argv,"ab:C:h:#::T::?l::L:O:P:sS::t:u:noVvWI?", long_options, &option_index)) != EOF) { @@ -3856,6 +3857,7 @@ static void get_options(int argc,char **argv) use_help(); exit(1); } + optind = 0; // setup so that getopt_long() can be called again fix_paths(); default_table_type_name=ha_table_typelib.type_names[default_table_type-1]; default_tx_isolation_name=tx_isolation_typelib.type_names[default_tx_isolation]; |