From e8d66a287128ef17077312d21328dcab5a023540 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 1 Aug 2002 15:19:06 +0300 Subject: [PATCH] few small fixes BitKeeper/etc/ignore: Added mysys/ste5KbMa to the ignore list include/my_semaphore.h: A small fix for BSDi sql/sql_update.cc: Just a proper error message --- .bzrignore | 1 + include/my_semaphore.h | 4 ++-- sql/sql_update.cc | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.bzrignore b/.bzrignore index 811cd82d56c..7b49824893c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -483,3 +483,4 @@ scripts/mysql_tableinfo libmysql/net.c libmysqld/sql_olap.cc myisam/myisam.log +mysys/ste5KbMa diff --git a/include/my_semaphore.h b/include/my_semaphore.h index aecbde09511..e08138495f7 100644 --- 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 +#elif defined(__bsdi__) +#include #else - #ifdef __WIN__ typedef HANDLE sem_t; #else diff --git a/sql/sql_update.cc b/sql/sql_update.cc index fda07721da8..5a7c0cb782f 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -432,7 +432,7 @@ multi_update::prepare(List &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