Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1

into teton.kitebird.com:/home/paul/mysql-4.1

libmysqld/Makefile.am

@@ -74,7 +74,6 @@ INC_LIB=	$(top_builddir)/regex/libregex.a \
 		$(top_builddir)/mysys/libmysys.a \
 		$(top_builddir)/strings/libmystrings.a \
 		$(top_builddir)/dbug/libdbug.a \
-		$(top_builddir)/regex/libregex.a \
 		$(top_builddir)/vio/libvio.a
 
 #

libmysqld/lib_sql.cc

@@ -96,6 +96,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
     net->last_error[0]= 0;
     strmov(net->sqlstate, not_error_sqlstate);
   }
+  mysql->server_status= thd->server_status;
   mysql->warning_count= ((THD*)mysql->thd)->total_warn_count;
   return result;
 }
@@ -484,7 +485,7 @@ int check_embedded_connection(MYSQL *mysql)
   THD *thd= (THD*)mysql->thd;
   thd->host= (char*)my_localhost;
   thd->host_or_ip= thd->host;
-  thd->user= mysql->user;
+  thd->user= my_strdup(mysql->user, MYF(0));
   return 0;
 }
 
@@ -498,8 +499,8 @@ int check_embedded_connection(MYSQL *mysql)
 
   if (mysql->options.client_ip)
   {
-    thd->host= mysql->options.client_ip;
-    thd->ip= thd->host;
+    thd->host= my_strdup(mysql->options.client_ip, MYF(0));
+    thd->ip= my_strdup(thd->host, MYF(0));
   }
   else
     thd->host= (char*)my_localhost;
@@ -511,7 +512,7 @@ int check_embedded_connection(MYSQL *mysql)
     goto err;
   }
 
-  thd->user= mysql->user;
+  thd->user= my_strdup(mysql->user, MYF(0));
   if (mysql->passwd && mysql->passwd[0])
   {
     memset(thd->scramble, 55, SCRAMBLE_LENGTH); // dummy scramble

sql/sql_class.cc

@@ -323,13 +323,11 @@ THD::~THD()
 #endif
 
   DBUG_PRINT("info", ("freeing host"));
-#ifndef EMBEDDED_LIBRARY
   if (host != my_localhost)			// If not pointer to constant
     safeFree(host);
   if (user != delayed_user)
     safeFree(user);
   safeFree(ip);
-#endif
   safeFree(db);
   free_root(&warn_root,MYF(0));
   free_root(&transaction.mem_root,MYF(0));

sql/sql_yacc.yy

@@ -1833,6 +1833,7 @@ slave:
 	    lex->type = 0;
 	    /* We'll use mi structure for UNTIL options */
 	    bzero((char*) &lex->mi, sizeof(lex->mi));
+            /* If you change this code don't forget to update SLAVE START too */
           }
           slave_until
           {}
@@ -1841,6 +1842,7 @@ slave:
 	    LEX *lex=Lex;
             lex->sql_command = SQLCOM_SLAVE_STOP;
 	    lex->type = 0;
+            /* If you change this code don't forget to update SLAVE STOP too */
           }
 	| SLAVE START_SYM slave_thread_opts
          {