Merge work.mysql.com:/home/bk/mysql

into work.mysql.com:/d1/users/tim/src/mysql


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

BitKeeper/etc/logging_ok

 jani@prima.mysql.com
+jcole@tetra.bedford.progress.com
+jcole@tetra.spaceapes.com
 monty@donna.mysql.com
 monty@narttu.mysql.fi
+mwagner@evoq.home.mwagner.org
 mwagner@work.mysql.com
+sasha@laptop.slkc.uswest.net
 sasha@mysql.sashanet.com
+sasha@work.mysql.com
 serg@serg.mysql.com
 tim@threads.polyesthetic.msg
+tim@work.mysql.com
 yfaktoro@nslinuxw2.bedford.progress.com

client/thread_test.c

@@ -16,10 +16,6 @@
    MA 02111-1307, USA */
 
 #include <global.h>
-#include <my_sys.h>
-#include <my_pthread.h>
-#include "mysql.h"
-#include <getopt.h>
 
 #ifndef THREAD
 
@@ -30,6 +26,11 @@ int main(int argc, char **argv)
 }
 #else
 
+#include <my_sys.h>
+#include <my_pthread.h>
+#include "mysql.h"
+#include <getopt.h>
+
 static my_bool version,verbose;
 static uint thread_count,number_of_tests=1000,number_of_threads=2;
 static pthread_cond_t COND_thread_count;

sql/ha_berkeley.cc

@@ -1375,8 +1375,9 @@ int ha_berkeley::external_lock(THD *thd, int lock_type)
           && !(thd->options & OPTION_BEGIN))
       {
 	/* 
-	   F_UNLOCK is done without a transaction commit / rollback. This
-	   means that something went wrong.
+	   F_UNLOCK is done without a transaction commit / rollback.
+	   This happens if the thread didn't update any rows or if
+	   something went wrong during an update.
 	   We can in this case silenty abort the transaction.
 	*/
 	DBUG_PRINT("trans",("aborting transaction"));