Merge mysql.com:/d2/hf/clean/my51-clean

into  mysql.com:/d2/hf/common/my51-common


libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_insert.cc:
  Auto merged
BitKeeper/deleted/.del-ps_not_windows.test:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

3 files changed, 33 insertions, 5 deletions

diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 374f2e61e72..a0a041d2f8d 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -80,6 +80,7 @@ libmysqld_a_SOURCES=
 
 sqlstoragesources =	$(EXTRA_libmysqld_a_SOURCES)
 storagesources = @condition_dependent_plugin_modules@
+storageobjects = @condition_dependent_plugin_objects@
 storagesourceslinks = @condition_dependent_plugin_links@
 
 # automake misses these
@@ -110,6 +111,24 @@ ha_ndbcluster_binlog.o: ha_ndbcluster_binlog.cc
 handler.o:	handler.cc
 		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
+# We need rules to compile these as no good way
+# found to append fileslists that collected by configure
+# to the sources list
+
+ha_federated.o:ha_federated.cc
+		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+
+ha_heap.o:ha_heap.cc
+		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+
+ha_innodb.o:ha_innodb.cc
+		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+
+ha_myisam.o:ha_myisam.cc
+		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+
+ha_myisammrg.o:ha_myisammrg.cc
+		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
 
 #
 # To make it easy for the end user to use the embedded library we
@@ -121,18 +140,18 @@ handler.o:	handler.cc
 # need to add the same file twice to the library, so 'sort -u' save us
 # some time and spares unnecessary work.
 
-libmysqld.a:	libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES)
+libmysqld.a:	libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES) $(storageobjects)
 if DARWIN_MWCC
-	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u`
+	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` $(storageobjects)
 else
 		-rm -f libmysqld.a
 		if test "$(host_os)" = "netware" ; \
 		then \
-		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
+		  $(libmysqld_a_AR) libmysqld.a $(INC_LIB) libmysqld_int.a $(storageobjects); \
 		else \
 		  current_dir=`pwd`; \
 		  rm -rf tmp; mkdir tmp; \
-		  (for arc in ./libmysqld_int.a $(INC_LIB); do \
+		  (for arc in $(INC_LIB) ./libmysqld_int.a; do \
 		    arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \
 		    artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \
 		    for F in `$(AR) t $$arc | grep -v SYMDEF`; do \
@@ -143,6 +162,7 @@ else
 		      ls $$artmp/* | grep -v SYMDEF; \
 		      continue 2; fi; done; \
 		  done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \
+		  $(AR) r libmysqld.a $(storageobjects); \
 		  $(RANLIB) libmysqld.a	; \
 		  rm -rf tmp; \
 		fi
diff --git a/libmysqld/examples/test-run b/libmysqld/examples/test-run
index c7434488259..aea5b13eaba 100755
--- a/libmysqld/examples/test-run
+++ b/libmysqld/examples/test-run
@@ -10,7 +10,7 @@
 top_builddir=../..
 mysql_test_dir=$top_builddir/mysql-test
 examples=$top_builddir/libmysqld/examples
-mysqltest=$examples/mysqltest
+mysqltest=$examples/mysqltest_embedded
 datadir=$mysql_test_dir/var/master-data
 test_data_dir=test
 gdb=0
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 9251ddd421a..b339cb5521b 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -542,6 +542,7 @@ int init_embedded_server(int argc, char **argv, char **groups)
     }
   }
 
+  execute_ddl_log_recovery();
   return 0;
 }
 
@@ -549,6 +550,7 @@ void end_embedded_server()
 {
   my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR));
   copy_arguments_ptr=0;
+  release_ddl_log();
   clean_up(0);
 }
 
@@ -586,6 +588,7 @@ void *create_embedded_thd(int client_flag)
   thd->set_time();
   thd->init_for_queries();
   thd->client_capabilities= client_flag;
+  thd->real_id= (pthread_t) thd;
 
   thd->db= NULL;
   thd->db_length= 0;
@@ -771,6 +774,8 @@ MYSQL_DATA *THD::alloc_new_dataset()
 
 static void write_eof_packet(THD *thd)
 {
+  if (!thd->mysql)            // bootstrap file handling
+    return;
   /*
     The following test should never be true, but it's better to do it
     because if 'is_fatal_error' is set the server is not going to execute
@@ -1030,6 +1035,9 @@ void Protocol_simple::prepare_for_resend()
   MYSQL_DATA *data= thd->cur_data;
   DBUG_ENTER("send_data");
 
+  if (!thd->mysql)            // bootstrap file handling
+    DBUG_VOID_RETURN;
+
   data->rows++;
   if (!(cur= (MYSQL_ROWS *)alloc_root(alloc, sizeof(MYSQL_ROWS)+(field_count + 1) * sizeof(char *))))
   {