Commit eb061b35 authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/drop_temp_table.result:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
configure.in:
  SCCS merged
sql/sql_base.cc:
  SCCS merged
sql/sql_parse.cc:
  SCCS merged
parents 88f264f0 96f9c9d9

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/r/drop_temp_table.result

+1 −3
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ master-bin.000001 # Query 1 # create database `drop-temp+table-test` 
master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table shortn1 (a int)

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table `table:name` (a int)

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table shortn2 (a int)

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`shortn2`

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`shortn1`

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`shortn2`,`drop-temp+table-test`.`table:name`,`drop-temp+table-test`.`shortn1`

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DO RELEASE_LOCK("a")

drop database `drop-temp+table-test`;

mysql-test/r/rpl_drop_temp.result

0 → 100644
+12 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create database if not exists mysqltest;

create temporary table mysqltest.t1 (n int);

create temporary table mysqltest.t2 (n int);

show status like 'Slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	0

mysql-test/r/rpl_multi_query.result

0 → 100644
+32 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

drop database if exists mysqltest;

create database mysqltest;

create table mysqltest.t1 ( n int);

insert into mysqltest.t1 values(1)/

insert into mysqltest.t1 values(2);

insert into mysqltest.t1 values(3);

insert into mysqltest.t1 values(4);

insert into mysqltest.t1 values(5)/

select * from mysqltest.t1;

n

1

2

3

4

5

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	#	Query	1	#	drop database if exists mysqltest

master-bin.000001	#	Query	1	#	create database mysqltest

master-bin.000001	#	Query	1	#	use `test`; create table mysqltest.t1 ( n int)

master-bin.000001	#	Query	1	#	use `test`; insert into mysqltest.t1 values(1)

master-bin.000001	#	Query	1	#	use `test`; insert into mysqltest.t1 values(2)

master-bin.000001	#	Query	1	#	use `test`; insert into mysqltest.t1 values(3)

master-bin.000001	#	Query	1	#	use `test`; insert into mysqltest.t1 values(4)

master-bin.000001	#	Query	1	#	use `test`; insert into mysqltest.t1 values(5)

drop database mysqltest;

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;