summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <holyfoot@deer.(none)>2006-01-23 11:58:14 +0400
committerunknown <holyfoot@deer.(none)>2006-01-23 11:58:14 +0400
commit823ec15c65d9831fdf3a3521b214dbf1a20ca1ec (patch)
tree8f492f3265c018e9b62222f1c6928c045bcb9d0c /libmysqld
parentd07932a3f19aa5bbaf50ea40aca9ad5cce5abb54 (diff)
downloadmariadb-git-823ec15c65d9831fdf3a3521b214dbf1a20ca1ec.tar.gz
Fixes about the embedded-server in 5.1
libmysqld/lib_sql.cc: logger initialization added mysql-test/mysql-test-run.pl: ndbcluster and ssl disabled in embedded server mysql-test/mysql-test-run.sh: ndbcluster disabled in embedded server mysql-test/r/mysqltest.result: result fixed mysql-test/r/sp_notembedded.result: result fixed mysql-test/t/log_tables.test: test disabled in embedded server mysql-test/t/sp_notembedded.test: test fixed
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index fe60b4fd19c..c39f1b1f373 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -491,6 +491,12 @@ int init_embedded_server(int argc, char **argv, char **groups)
my_progname= (char *)"mysql_embedded";
+ /*
+ Perform basic logger initialization logger. Should be called after
+ MY_INIT, as it initializes mutexes. Log tables are inited later.
+ */
+ logger.init_base();
+
if (init_common_variables("my", *argcp, *argvp, (const char **)groups))
{
mysql_server_end();