Commit 968e06a8 authored by unknown's avatar unknown
Browse files

Manual merge 


mysql-test/t/delete.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged
parents 69a6d4da d6157bec

mysql-test/r/delete.result

+9 −0
Original line number Diff line number Diff line
@@ -163,3 +163,12 @@ select * from t1; 
a	b

7	7

drop table t1;

CREATE TABLE t1 ( a int PRIMARY KEY );

DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a;

INSERT INTO t1 VALUES (0),(1),(2);

DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a LIMIT 1;

SELECT * FROM t1;

a

0

2

DROP TABLE t1;

mysql-test/t/delete.test

+11 −0
Original line number Diff line number Diff line
@@ -141,3 +141,14 @@ delete t1 from t1 where a = 3; 
check table t1;

select * from t1;

drop table t1;



#

# Bug #8392: delete with ORDER BY containing a direct reference to the table 

#

 

CREATE TABLE t1 ( a int PRIMARY KEY );

DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a;

INSERT INTO t1 VALUES (0),(1),(2);

DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a LIMIT 1;

SELECT * FROM t1;

DROP TABLE t1;

sql/sql_delete.cc

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order, 


    bzero((char*) &tables,sizeof(tables));

    tables.table = table;

    tables.alias = table_list->alias;



    table->sort.io_cache = (IO_CACHE *) my_malloc(sizeof(IO_CACHE),

                                             MYF(MY_FAE | MY_ZEROFILL));