mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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
This commit is contained in:
@ -483,3 +483,4 @@ scripts/mysql_tableinfo
|
|||||||
libmysql/net.c
|
libmysql/net.c
|
||||||
libmysqld/sql_olap.cc
|
libmysqld/sql_olap.cc
|
||||||
myisam/myisam.log
|
myisam/myisam.log
|
||||||
|
mysys/ste5KbMa
|
||||||
|
@ -32,11 +32,11 @@
|
|||||||
#define _my_semaphore_h_
|
#define _my_semaphore_h_
|
||||||
|
|
||||||
C_MODE_START
|
C_MODE_START
|
||||||
|
|
||||||
#ifdef HAVE_SEMAPHORE_H
|
#ifdef HAVE_SEMAPHORE_H
|
||||||
#include <semaphore.h>
|
#include <semaphore.h>
|
||||||
|
#elif defined(__bsdi__)
|
||||||
|
#include <sys/errno.h>
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#ifdef __WIN__
|
#ifdef __WIN__
|
||||||
typedef HANDLE sem_t;
|
typedef HANDLE sem_t;
|
||||||
#else
|
#else
|
||||||
|
@ -432,7 +432,7 @@ multi_update::prepare(List<Item> &values)
|
|||||||
}
|
}
|
||||||
if (!table_ref)
|
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);
|
DBUG_RETURN(1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user