Commit 99abc81c authored by Patrick Crews's avatar Patrick Crews
Browse files

Merge 5.0 -> 5.1

parents a938da53 c7f32b02

mysql-test/extra/rpl_tests/rpl_EE_err.test

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


eval create table t1 (a int) engine=$engine_type;

flush tables;

system rm $MYSQLTEST_VARDIR/master-data/test/t1.MYI ;

remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYI ;

drop table if exists t1;

save_master_pos;

connection slave;

mysql-test/include/ndb_backup_print.inc

+2 −1
Original line number Diff line number Diff line 
--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter > $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 2 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter >> $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec sort $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec rm -f $MYSQLTEST_VARDIR/tmp/tmp.dat

--error 0,1

--remove_file $MYSQLTEST_VARDIR/tmp/tmp.dat

--let ndb_restore_opts=

--let ndb_restore_filter=

mysql-test/r/distinct.result

+59 −0
Original line number Diff line number Diff line
@@ -608,6 +608,65 @@ id select_type table type possible_keys key key_len ref rows Extra 
SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;

a	a

DROP TABLE t1;

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (id INT NOT NULL, fruit_id INT NOT NULL, fruit_name varchar(20)

default NULL);

INSERT INTO t1 VALUES (1,1,'ORANGE');

INSERT INTO t1 VALUES (2,2,'APPLE');

INSERT INTO t1 VALUES (3,2,'APPLE');

INSERT INTO t1 VALUES (4,3,'PEAR');

SELECT DISTINCT fruit_id, fruit_name INTO @v1, @v2 FROM t1 WHERE fruit_name = 

'APPLE';

SELECT @v1, @v2;

@v1	@v2

2	APPLE

SELECT DISTINCT fruit_id, fruit_name INTO @v3, @v4 FROM t1 GROUP BY fruit_id, 

fruit_name HAVING fruit_name = 'APPLE';

SELECT @v3, @v4;

@v3	@v4

2	APPLE

SELECT DISTINCT @v5:= fruit_id, @v6:= fruit_name INTO @v7, @v8 FROM t1 WHERE 

fruit_name = 'APPLE';

SELECT @v5, @v6, @v7, @v8;

@v5	@v6	@v7	@v8

3	PEAR	3	PEAR

SELECT DISTINCT @v5 + fruit_id, CONCAT(@v6, fruit_name) INTO @v9, @v10 FROM t1 

WHERE fruit_name = 'APPLE';

SELECT @v5, @v6, @v7, @v8, @v9, @v10;

@v5	@v6	@v7	@v8	@v9	@v10

3	PEAR	3	PEAR	5	PEARAPPLE

SELECT DISTINCT @v11:= @v5 + fruit_id, @v12:= CONCAT(@v6, fruit_name) INTO 

@v13, @v14 FROM t1 WHERE fruit_name = 'APPLE';

SELECT @v11, @v12, @v13, @v14;

@v11	@v12	@v13	@v14

6	PEARPEAR	6	PEARPEAR

SELECT DISTINCT @v13, @v14 INTO @v15, @v16 FROM t1 WHERE fruit_name = 'APPLE';

SELECT @v15, @v16;

@v15	@v16

6	PEARPEAR

SELECT DISTINCT 2 + 2, 'Bob' INTO @v17, @v18 FROM t1 WHERE fruit_name = 

'APPLE';

SELECT @v17, @v18;

@v17	@v18

4	Bob

DROP TABLE IF EXISTS t2;

CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20)

default NULL);

SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE 

'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';

LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;

SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE 

'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';

LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;

SELECT @v19, @v20;

@v19	@v20

2	APPLE

SELECT * FROM t2;

fruit_id	fruit_name

2	APPLE

2	APPLE

DROP TABLE t1;

DROP TABLE t2;

CREATE TABLE t1 (a CHAR(1));

INSERT INTO t1 VALUES('A'), (0);

SELECT a FROM t1 WHERE a=0;

mysql-test/suite/binlog/t/binlog_killed_simulate.test

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ let $error_code= `select @a like "%#%error_code=0%" /* must return 1 */`; 
eval select $error_code /* must return 1 as query completed before got killed*/;



# cleanup for the sub-case

system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;

remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;





#
@@ -61,7 +61,7 @@ let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`; 
eval select $error_code /* must return 0 to mean the killed query is in */;



# cleanup for the sub-case

system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;

remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;





drop table t1,t2;

mysql-test/suite/binlog/t/binlog_start_comment.test

+1 −1
Original line number Diff line number Diff line
@@ -21,4 +21,4 @@ select * from t2; 


# clean up

drop table t1,t2;

#--system rm $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
 
#--remove_file $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog