Commit b1060052 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect3.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
BitKeeper/deleted/.del-bdb.result:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
mysql-test/r/binlog_stm_blackhole.result:
  manual merge
mysql-test/r/insert_select.result:
  manual merge
mysql-test/r/subselect.result:
  manual merge
mysql-test/r/update.result:
  manual merge
mysql-test/t/insert_select.test:
  manual merge
mysql-test/t/subselect.test:
  manual merge
sql/sql_help.cc:
  manual merge
sql/sql_insert.cc:
  manual merge
sql/sql_update.cc:
  manual merge
parents 5b64b12c 90d4f809

mysql-test/extra/binlog_tests/blackhole.test

+15 −0
Original line number Diff line number Diff line
@@ -128,6 +128,21 @@ show binlog events; 


drop table t1,t2,t3;



#

#Bug#19717: DELETE Query Error on BLACKHOLE when using WHERE on column with UNIQUE INDEX

#

CREATE TABLE t1(a INT, b INT) ENGINE=BLACKHOLE;

DELETE FROM t1 WHERE a=10;

ALTER TABLE t1 ADD INDEX(a);

DELETE FROM t1 WHERE a=10;

ALTER TABLE t1 DROP INDEX a;

ALTER TABLE t1 ADD UNIQUE INDEX(a);

DELETE FROM t1 WHERE a=10;

ALTER TABLE t1 DROP INDEX a;

ALTER TABLE t1 ADD PRIMARY KEY(a);

DELETE FROM t1 WHERE a=10;

DROP TABLE t1;



# End of 4.1 tests

# Test that a transaction which is rolled back does not go into binlog

# and that a transaction which is committed does

mysql-test/r/binlog_stm_blackhole.result

+11 −0
Original line number Diff line number Diff line
@@ -123,6 +123,17 @@ master-bin.000001 # Query 1 # use `test`; create table t3 like t1 
master-bin.000001	#	Query	1	#	use `test`; insert into t1 select * from t3

master-bin.000001	#	Query	1	#	use `test`; replace into t1 select * from t3

drop table t1,t2,t3;

CREATE TABLE t1(a INT, b INT) ENGINE=BLACKHOLE;

DELETE FROM t1 WHERE a=10;

ALTER TABLE t1 ADD INDEX(a);

DELETE FROM t1 WHERE a=10;

ALTER TABLE t1 DROP INDEX a;

ALTER TABLE t1 ADD UNIQUE INDEX(a);

DELETE FROM t1 WHERE a=10;

ALTER TABLE t1 DROP INDEX a;

ALTER TABLE t1 ADD PRIMARY KEY(a);

DELETE FROM t1 WHERE a=10;

DROP TABLE t1;

reset master;

create table t1 (a int) engine=blackhole;

set autocommit=0;

mysql-test/r/endspace.result

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ concat('|', text1, '|') 
|teststring |

explain select concat('|', text1, '|') from t1 where text1='teststring ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	key1	key1	22	NULL	2	Using where

1	SIMPLE	t1	ref	key1	key1	22	const	2	Using where

select concat('|', text1, '|') from t1 where text1 like 'teststring_%';

concat('|', text1, '|')

|teststring	|

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -1984,7 +1984,7 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	ref	c	c	11	const	#	Using where; Using index

explain select count(*) from t1 where t='a  ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	t	t	13	NULL	#	Using where

1	SIMPLE	t1	ref	t	t	13	const	#	Using where

explain select count(*) from t1 where v like 'a%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	13	NULL	#	Using where; Using index

mysql-test/r/insert_select.result

+27 −0
Original line number Diff line number Diff line
@@ -717,3 +717,30 @@ select * from t1; 
f1	f2

1	2

drop table t1;

create table t1(f1 int primary key auto_increment, f2 int unique);

insert into t1(f2) values(1);

select @@identity;

@@identity

1

insert ignore t1(f2) values(1);

select @@identity;

@@identity

0

insert ignore t1(f2) select 1;

select @@identity;

@@identity

0

drop table t1;

CREATE TABLE t1 (f1 INT, f2 INT );

CREATE TABLE t2  (f1 INT PRIMARY KEY, f2 INT);

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

INSERT INTO t2 (f1, f2) SELECT f1, f2 FROM t1;

INSERT INTO t2 (f1, f2)

SELECT f1, f1 FROM t2 src WHERE f1 < 2

ON DUPLICATE KEY UPDATE f1 = 100 + src.f1;

SELECT * FROM t2;

f1	f2

101	1

2	2

10	10

DROP TABLE t1, t2;