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 | |
| parent | 99039957feba6543c7d52b6dcfc5b9f349ee0047 (diff) | |
| parent | 774a5778d5db1062c26bd55d02a09c5d98a74525 (diff) | |
| download | mariadb-git-dd2e3db48fce43f6249e1c23b3cf0f5057b41d4e.tar.gz | |
merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 24 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index bfbe02f9339..279f1007243 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -1,21 +1,17 @@ -# Copyright (C) 2001-2006 MySQL AB +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; version 2 -# of the License. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. # -# This library is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -# MA 02111-1307, USA -# -# This file is public domain and comes with NO WARRANTY of any kind +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) 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; |