Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

.bzrignore

@@ -483,3 +483,4 @@ scripts/mysql_tableinfo
 libmysql/net.c
 libmysqld/sql_olap.cc
 myisam/myisam.log
+mysys/ste5KbMa

include/my_semaphore.h

@@ -32,11 +32,11 @@
 #define _my_semaphore_h_
 
 C_MODE_START
-
 #ifdef HAVE_SEMAPHORE_H
 #include <semaphore.h>
+#elif defined(__bsdi__)
+#include <sys/errno.h>
 #else
-
 #ifdef __WIN__
 typedef HANDLE sem_t;
 #else

sql/sql_update.cc

@@ -432,7 +432,7 @@ multi_update::prepare(List<Item> &values)
     }
     if (!table_ref)
     {
-      error = 1; // A proper error message is due here 
+      net_printf(&thd->net, ER_NOT_SUPPORTED_YET, "JOIN SYNTAX WITH MULTI-TABLE UPDATES");
       DBUG_RETURN(1);
     }
     else