bk commit into 5.0 tree (holyfoot:1.2304)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-13 10:45:22+04:00, holyfoot@stripped +3 -0
  Merge mysql.com:/home/hf/work/embt/my41-embt
  into  mysql.com:/home/hf/work/embt/my50-embt
  MERGE: 1.1616.2791.2

  libmysqld/lib_sql.cc@stripped, 2006-11-13 10:45:19+04:00, holyfoot@stripped +0 -0
    SCCS merged
    MERGE: 1.75.1.55

  mysql-test/t/innodb.test@stripped, 2006-11-13 10:45:04+04:00, holyfoot@stripped +0 -3
    merging
    MERGE: 1.62.1.19

  sql/item_func.cc@stripped, 2006-11-13 10:40:06+04:00, holyfoot@stripped +0 -0
    Auto merged
    MERGE: 1.124.42.15

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/embt/my50-embt/RESYNC

--- 1.309/sql/item_func.cc	2006-11-13 10:45:30 +04:00
+++ 1.310/sql/item_func.cc	2006-11-13 10:45:30 +04:00
@@ -3347,7 +3347,11 @@ longlong Item_func_release_lock::val_int
   }
   else
   {
+#ifdef EMBEDDED_LIBRARY
+    if (ull->locked && pthread_equal(current_thd->real_id,ull->thread))
+#else
     if (ull->locked && pthread_equal(pthread_self(),ull->thread))
+#endif
     {
       result=1;					// Release is ok
       item_user_lock_release(ull);

--- 1.115/libmysqld/lib_sql.cc	2006-11-13 10:45:30 +04:00
+++ 1.116/libmysqld/lib_sql.cc	2006-11-13 10:45:30 +04:00
@@ -584,6 +584,7 @@ void *create_embedded_thd(int client_fla
   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;
@@ -1027,6 +1028,9 @@ void Protocol_simple::prepare_for_resend
   MYSQL_ROWS *cur;
   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 *))))