diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-10-04 15:42:16 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-10-04 15:42:16 +0300 |
| commit | dd2e3db48fce43f6249e1c23b3cf0f5057b41d4e (patch) | |
| tree | 0b41fbab5c8e486500b5c53bbe818e62f6f583f2 /libmysqld/lib_sql.cc | |
| parent | 99039957feba6543c7d52b6dcfc5b9f349ee0047 (diff) | |
| parent | 774a5778d5db1062c26bd55d02a09c5d98a74525 (diff) | |
| download | mariadb-git-dd2e3db48fce43f6249e1c23b3cf0f5057b41d4e.tar.gz | |
merge
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index a1a57e70499..1c9b773de15 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -479,6 +479,10 @@ int init_embedded_server(int argc, char **argv, char **groups) char *fake_argv[] = { (char *)"", 0 }; const char *fake_groups[] = { "server", "embedded", 0 }; my_bool acl_error; + + if (my_thread_init()) + return 1; + if (argc) { argcp= &argc; |