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

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

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
8ada4087 · Sinisa@sinisa.nasamreza.org · f582a463 · da8d3d0c · 8ada4087 · 8ada4087
Commit 8ada4087 authored Aug 01, 2002 by Sinisa@sinisa.nasamreza.org
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

.bzrignore .bzrignore +1 -0

include/my_semaphore.h include/my_semaphore.h +2 -2

sql/sql_update.cc sql/sql_update.cc +1 -1

No files found.
--- a/.bzrignore
+++ b/.bzrignore
@@ -483,3 +483,4 @@ scripts/mysql_tableinfo
 libmysql/net.c
 libmysqld/sql_olap.cc
 myisam/myisam.log
+mysys/ste5KbMa
--- a/include/my_semaphore.h
+++ b/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

--- a/sql/sql_update.cc
+++ b/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