diff options
author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-10-27 18:08:50 +0500 |
---|---|---|
committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-10-27 18:08:50 +0500 |
commit | d2c90fcb8ecee24d68df83c83a70c0a8b8ab77c8 (patch) | |
tree | fd0ff9082aaef6ec7dec1429a9a98deb31c903da /sql/sql_delete.cc | |
parent | 5decebc5f3aa6fc2584f6fcbd81ab7e42b63ede5 (diff) | |
download | mariadb-git-d2c90fcb8ecee24d68df83c83a70c0a8b8ab77c8.tar.gz |
Fix for bug #23412: delete rows with null date field
Backport of the fix for bug #8143: A date with value 0 is treated as a NULL value
mysql-test/r/delete.result:
Fix for bug #23412: delete rows with null date field
- test result
mysql-test/t/delete.test:
Fix for bug #23412: delete rows with null date field
- test case
sql/sql_delete.cc:
Fix for bug #23412: delete rows with null date field
- during SELECT queries processing we convert 'date[time]_field is null'
conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null
DATE and DATETIME fields. To be consistent, we have to do the same for DELETE
queries. So we should call remove_eq_conds() in the mysql_delete() as well.
Also it may simplify and speed up DELETE queries execution.
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r-- | sql/sql_delete.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index b085d37be78..c1455c4b668 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -79,6 +79,14 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, /* Handler didn't support fast delete; Delete rows one by one */ } + if (conds) + { + Item::cond_result result; + conds= remove_eq_conds(thd, conds, &result); + if (result == Item::COND_FALSE) // Impossible where + limit= 0; + } + table->used_keys.clear_all(); table->quick_keys.clear_all(); // Can't use 'only index' select=make_select(table,0,0,conds,&error); |