diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-07-17 16:23:36 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-07-17 16:23:36 -0600 |
| commit | bab169b6923870bf2e08a80aa8e22d8851a9a10f (patch) | |
| tree | 6b12d97d09cd80fd52fbc48fbe802efa550e1112 /sql/sql_delete.cc | |
| parent | 90acfb9ff36c796650b40c8b85f2f4042c60d1fc (diff) | |
| parent | 4c26f24575d8c95a39a3f007ef72f6818d8d1439 (diff) | |
| download | mariadb-git-bab169b6923870bf2e08a80aa8e22d8851a9a10f.tar.gz | |
merged with 3.23
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
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index c2ac8c05b85..d14201822e0 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -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 */ |