Merge with 4.1.3-beta

4 files changed, 25 insertions, 12 deletions

diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 29e88eb41f2..390dab409b3 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -22,7 +22,6 @@ MYSQLSHAREdir =		$(pkgdatadir)
 MYSQLBASEdir=		$(prefix)
 
 DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
-			-DNO_EMBEDDED_ACCESS_CHECKS \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\""
@@ -34,7 +33,8 @@ noinst_LIBRARIES =	libmysqld_int.a
 pkglib_LIBRARIES =	libmysqld.a
 SUBDIRS =		. examples
 libmysqld_sources=	libmysqld.c lib_sql.cc emb_qcache.cc
-libmysqlsources =	errmsg.c get_password.c libmysql.c client.c pack.c
+libmysqlsources =	errmsg.c get_password.c libmysql.c client.c pack.c \
+                        my_time.c
 
 noinst_HEADERS =	embedded_priv.h emb_qcache.h
 
@@ -57,7 +57,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
 	sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
 	sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
 	unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \
-	spatial.cc gstream.cc sql_help.cc protocol_cursor.cc \
+	spatial.cc gstream.cc sql_help.cc tztime.cc protocol_cursor.cc \
 	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
 	parse_file.cc
 
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 2bbca220db9..0adf9aeb86a 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -23,6 +23,11 @@
 #define mysql_unix_port mysql_inix_port1
 #define mysql_port mysql_port1
 
+extern "C"
+{
+  extern unsigned long max_allowed_packet, net_buffer_length;
+}
+
 static int fake_argc= 1;
 static char *fake_argv[]= {(char *)"", 0};
 static const char *fake_groups[] = { "server", "embedded", 0 };
@@ -351,6 +356,7 @@ int init_embedded_server(int argc, char **argv, char **groups)
   int fake_argc = 1;
   char *fake_argv[] = { (char *)"", 0 };
   const char *fake_groups[] = { "server", "embedded", 0 };
+  my_bool acl_error;
   if (argc)
   {
     argcp= &argc;
@@ -392,16 +398,17 @@ int init_embedded_server(int argc, char **argv, char **groups)
 
   error_handler_hook = my_message_sql;
 
+  acl_error= 0;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  if (acl_init((THD *)0, opt_noacl))
+  if (!(acl_error= acl_init((THD *)0, opt_noacl)) &&
+      !opt_noacl)
+    (void) grant_init((THD *)0);
+#endif
+  if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap))
   {
     mysql_server_end();
     return 1;
   }
-  if (!opt_noacl)
-    (void) grant_init((THD *)0);
-
-#endif
 
   init_max_user_conn();
   init_update_queries();
@@ -506,6 +513,7 @@ int check_embedded_connection(MYSQL *mysql)
   thd->host= (char*)my_localhost;
   thd->host_or_ip= thd->host;
   thd->user= my_strdup(mysql->user, MYF(0));
+  thd->priv_user= thd->user;
   return check_user(thd, COM_CONNECT, NULL, 0, thd->db, true);
 }
 
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index db9e828369d..3b9c2bab448 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -47,6 +47,9 @@
 #define INADDR_NONE	-1
 #endif
 
+extern ulong net_buffer_length;
+extern ulong max_allowed_packet;
+
 #if defined(MSDOS) || defined(__WIN__)
 #define ERRNO WSAGetLastError()
 #define perror(A)
@@ -81,7 +84,8 @@ static void end_server(MYSQL *mysql)
   DBUG_VOID_RETURN;
 }
 
-static inline int mysql_init_charset(MYSQL *mysql)
+
+static int mysql_init_charset(MYSQL *mysql)
 {
   char charset_name_buff[16], *charset_name;
 
@@ -124,6 +128,7 @@ static inline int mysql_init_charset(MYSQL *mysql)
   return 0;
 }
 
+
 MYSQL * STDCALL
 mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
 		   const char *passwd, const char *db,
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
index 8b2ad8379d6..ac982f9110e 100644
--- a/libmysqld/libmysqld.def
+++ b/libmysqld/libmysqld.def
@@ -2,7 +2,8 @@ LIBRARY		LIBMYSQLD
 DESCRIPTION	'MySQL 4.1 Embedded Server Library'
 VERSION		4.1
 EXPORTS
-	_dig_vec
+	_dig_vec_upper
+	_dig_vec_lower
 	bmove_upp
 	delete_dynamic
 	free_defaults
@@ -92,7 +93,6 @@ EXPORTS
 	mysql_thread_safe
 	mysql_use_result
 	mysql_warning_count
-	net_buffer_length
 	set_dynamic
 	strcend
 	strcont
@@ -128,5 +128,5 @@ EXPORTS
 	alloc_root
 	free_root
 	my_read
-	max_allowed_packet
 	llstr
+	mysql_get_parameters