database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

merged with 3.23

Browse Source 
configure.in:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
Docs/manual.texi:
  merged
mysql-test/t/rpl_sporadic_master.test:
  merged
sql/Makefile.am:
  merged
sql/slave.h:
  merged
This commit is contained in:
unknown
2001-07-17 16:23:36 -06:00
parent 90acfb9ff3 4c26f24575
commit bab169b692
30 changed files with 331 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_delete.cc
View File

@@ -178,12 +178,13 @@ int mysql_delete(THD *thd,
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 */