Commit 39f5fdeb authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
parents dc162f61 0d4ef3a3

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.10)

AM_INIT_AUTOMAKE(mysql, 4.1.11)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=4

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=10

NDB_VERSION_BUILD=11

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

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;

mysql-test/t/rpl_multi_query.test

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
# CLIENT_MULTI_STATEMENTS) will be binlogged ONE-query-per-event (not

# one binlog event containing all queries)



# PS doesn't support multi-statements

--disable_ps_protocol



source include/master-slave.inc;

--disable_warnings

drop database if exists mysqltest;

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));