diff options
author | unknown <tim@black.box> | 2001-09-16 21:41:22 -0400 |
---|---|---|
committer | unknown <tim@black.box> | 2001-09-16 21:41:22 -0400 |
commit | 5fffbb123615ad0b256652390467b33ed2919afc (patch) | |
tree | 7ff6a4243043fa71bd04fa3434bd8e13992df771 /sql | |
parent | 34925f8d823c700c939f0622b6af85001458a226 (diff) | |
download | mariadb-git-5fffbb123615ad0b256652390467b33ed2919afc.tar.gz |
Add some examples for using libmysqld, including a hack for running the
mysql test suite.
A few minor libmysqld fixes.
Add mysql_server_init() and _end() to mysql.cc and mysqltest.c, so they
can be linked against libmysqlclient or libmysqld.
sql/mysqld.cc:
have unireg_end() exit(), instead of pthread_exit()
if inside the EMBEDDED_LIBRARY. This is a hack
which hopefully won't be needed. But without it,
the program hangs at end.
client/mysql.cc:
Don't call mysql_ssl_clear() unless HAVE_OPENSSL.
client/mysqltest.c:
Add mysql_server_init() and _end().
acinclude.m4:
change .. to $(top_builddir) in innodb_libs
Makefile.am:
Add libmysqld/examples to link_sources target
configure.in:
output libmysqld/examples/Makefile
Also, change .. to $(top_builddir) in readline_link
BitKeeper/etc/ignore:
added linked_libmysqldex_sources
mysql-test/mysql-test-run.sh:
use latin1, not latin1_de, in tests
libmysqld/libmysqld.c:
Add replication functions.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 05fdf6316c2..e8ab0c34702 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -684,7 +684,9 @@ static sig_handler print_signal_warning(int sig) void unireg_end(int signal_number __attribute__((unused))) { clean_up(); -#ifndef OS2 +#if defined(EMBEDDED_LIBRARY) + exit(0); // XXX QQ: this is a temporary hack (I hope) +#elif !defined(OS2) pthread_exit(0); // Exit is in main thread #endif } |