bk commit into 4.1 tree (holyfoot:1.2565)

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 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-12-08 15:15:33+04:00, holyfoot@stripped +2 -0
  Merge bk@stripped:mysql-4.1-opt
  into  mysql.com:/home/hf/work/embt/my41-embt
  MERGE: 1.2529.7.3

  libmysqld/lib_sql.cc@stripped, 2006-12-08 15:15:29+04:00, holyfoot@stripped +0 -0
    Auto merged
    MERGE: 1.129.1.1

  sql/item_func.cc@stripped, 2006-12-08 15:15:29+04:00, holyfoot@stripped +0 -0
    Auto merged
    MERGE: 1.266.1.1

# 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/my41-embt/RESYNC

--- 1.267/sql/item_func.cc	2006-12-08 15:15:38 +04:00
+++ 1.268/sql/item_func.cc	2006-12-08 15:15:38 +04:00
@@ -2238,7 +2238,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.130/libmysqld/lib_sql.cc	2006-12-08 15:15:38 +04:00
+++ 1.131/libmysqld/lib_sql.cc	2006-12-08 15:15:38 +04:00
@@ -224,20 +224,24 @@ static int emb_stmt_execute(MYSQL_STMT *
 {
   DBUG_ENTER("emb_stmt_execute");
   char header[4];
+  my_bool res;
+
   int4store(header, stmt->stmt_id);
   THD *thd= (THD*)stmt->mysql->thd;
   thd->client_param_count= stmt->param_count;
   thd->client_params= stmt->params;
-  if (emb_advanced_command(stmt->mysql, COM_EXECUTE,0,0,
-                           header, sizeof(header), 1, stmt) ||
-      emb_mysql_read_query_result(stmt->mysql))
+
+  res= test(emb_advanced_command(stmt->mysql, COM_EXECUTE,0,0,
+                                 header, sizeof(header), 1, stmt) ||
+            emb_mysql_read_query_result(stmt->mysql));
+  stmt->affected_rows= stmt->mysql->affected_rows;
+  stmt->insert_id= stmt->mysql->insert_id;
+  if (res)
   {
     NET *net= &stmt->mysql->net;
     set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);
     DBUG_RETURN(1);
   }
-  stmt->affected_rows= stmt->mysql->affected_rows;
-  stmt->insert_id= stmt->mysql->insert_id;
   DBUG_RETURN(0);
 }