Commit 25223439 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  mysql.com:/usr/home/ram/work/5.0.b8143
parents 774300af 16878843

mysql-test/r/delete.result

+10 −0
Original line number Diff line number Diff line
@@ -192,3 +192,13 @@ delete t2.*,t3.* from t1,t2,t3 where t1.a=t2.a AND t2.b=t3.a and t1.b=t3.b; 
select * from t3;

a	b

drop table t1,t2,t3;

create table t1(a date not null);

insert into t1 values (0);

select * from t1 where a is null;

a

0000-00-00

delete from t1 where a is null;

select count(*) from t1;

count(*)

0

drop table t1;

mysql-test/t/delete.test

+11 −0
Original line number Diff line number Diff line
@@ -171,3 +171,14 @@ delete t2.*,t3.* from t1,t2,t3 where t1.a=t2.a AND t2.b=t3.a and t1.b=t3.b; 
# This should be empty

select * from t3;

drop table t1,t2,t3;



#

# Bug #8143: deleting '0000-00-00' values using IS NULL

#



create table t1(a date not null);

insert into t1 values (0);

select * from t1 where a is null;

delete from t1 where a is null;

select count(*) from t1;

drop table t1;

sql/sql_delete.cc

+8 −0
Original line number Diff line number Diff line
@@ -91,6 +91,14 @@ bool 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, 0, &error);