mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Patch for netBSD
Added warning for tables where the auto_increment key is 0 Fixed DELETE ... LIMIT 0 Fixed UPDATE ..LIMIT 0 Docs/manual.texi: Changelog + Update to CHECK TABLE configure.in: Patch for netBSD mit-pthreads/gen/ctime.c: Patch for netBSD mit-pthreads/machdep/netbsd-1.1/__signal.h: Patch for netBSD mit-pthreads/stdio/strerror.c: Patch for netBSD myisam/mi_check.c: Added warning for tables where the auto_increment key is 0 myisam/myisamchk.c: Added warning for tables where the auto_increment key is 0 mysql-test/r/auto_increment.result: Added warning for tables where the auto_increment key is 0 mysql-test/r/limit.result: Test of DELETE ... LIMIT 0 mysql-test/t/auto_increment.test: Added warning for tables where the auto_increment key is 0 mysql-test/t/limit.test: Test of DELETE ... LIMIT 0 sql/Makefile.am: Don't add mysqld_LDADD to mysqlbinlog (portability patch) sql/ha_gemini.cc: Changed copyright (have got ok from NuSphere previously) sql/ha_gemini.h: Changed copyright (have got ok from NuSphere previously) sql/sql_delete.cc: Fixed DELETE ... LIMIT 0 sql/sql_update.cc: Fixed UPDATE ..LIMIT 0
This commit is contained in:
@@ -170,12 +170,13 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit,
|
||||
select=make_select(table,0,0,conds,&error);
|
||||
if (error)
|
||||
DBUG_RETURN(-1);
|
||||
if (select && select->check_quick(test(thd->options & SQL_SAFE_UPDATES),
|
||||
limit))
|
||||
if ((select && select->check_quick(test(thd->options & SQL_SAFE_UPDATES),
|
||||
limit)) ||
|
||||
!limit)
|
||||
{
|
||||
delete select;
|
||||
send_ok(&thd->net,0L);
|
||||
DBUG_RETURN(0);
|
||||
DBUG_RETURN(0); // Nothing to delete
|
||||
}
|
||||
|
||||
/* If running in safe sql mode, don't allow updates without keys */
|
||||
|
Reference in New Issue
Block a user