Commit 3bb915ea authored by svoj@june.mysql.com's avatar svoj@june.mysql.com
Browse files

Merge mysql.com:/home/svoj/devel/mysql/BUG34790/mysql-5.1-engines 

into  mysql.com:/home/svoj/devel/mysql/push/mysql-5.1-engines
parents 0d5bd0c6 715fcc7b

mysql-test/r/federated.result

+2 −0
Original line number Diff line number Diff line
@@ -2090,6 +2090,8 @@ a b 
1	1

DROP TABLE t1;

DROP TABLE t1;

CREATE TABLE t1 (a INT) ENGINE=federated CONNECTION='mysql://@:://';

DROP TABLE t1;

End of 5.1 tests

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

mysql-test/suite/binlog/r/binlog_stm_ps.result

+2 −1
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ master-bin.000001 # Query # # use `test`; create table t1 (a int) 
master-bin.000001	#	User var	#	#	@`a`=98

master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (@a),(98)

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

master-bin.000001	#	Query	#	#	use `test`; insert into t1 select 100 limit 100

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

drop table t1;

mysql-test/suite/binlog/r/binlog_unsafe.result

+28 −0
Original line number Diff line number Diff line
@@ -11,3 +11,31 @@ Level Warning 
Code	1592

Message	Statement is not safe to log in statement format.

DROP TABLE t1,t2,t3;

CREATE TABLE t1(a INT, b INT, KEY(a), PRIMARY KEY(b));

INSERT INTO t1 SELECT * FROM t1 LIMIT 1;

Warnings:

Warning	1592	Statement is not safe to log in statement format.

REPLACE INTO t1 SELECT * FROM t1 LIMIT 1;

Warnings:

Warning	1592	Statement is not safe to log in statement format.

UPDATE t1 SET a=1 LIMIT 1;

Warnings:

Warning	1592	Statement is not safe to log in statement format.

DELETE FROM t1 LIMIT 1;

Warnings:

Warning	1592	Statement is not safe to log in statement format.

CREATE PROCEDURE p1()

BEGIN

INSERT INTO t1 SELECT * FROM t1 LIMIT 1;

REPLACE INTO t1 SELECT * FROM t1 LIMIT 1;

UPDATE t1 SET a=1 LIMIT 1;

DELETE FROM t1 LIMIT 1;

END|

CALL p1();

Warnings:

Warning	1592	Statement is not safe to log in statement format.

Warning	1592	Statement is not safe to log in statement format.

Warning	1592	Statement is not safe to log in statement format.

Warning	1592	Statement is not safe to log in statement format.

DROP PROCEDURE p1;

DROP TABLE t1;

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

+21 −1
Original line number Diff line number Diff line
@@ -15,4 +15,24 @@ query_vertical SHOW WARNINGS; 


DROP TABLE t1,t2,t3;



#

# BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode if

#             binlog_format=mixed

#

CREATE TABLE t1(a INT, b INT, KEY(a), PRIMARY KEY(b));

INSERT INTO t1 SELECT * FROM t1 LIMIT 1;

REPLACE INTO t1 SELECT * FROM t1 LIMIT 1;

UPDATE t1 SET a=1 LIMIT 1;

DELETE FROM t1 LIMIT 1;

delimiter |;

CREATE PROCEDURE p1()

BEGIN

  INSERT INTO t1 SELECT * FROM t1 LIMIT 1;

  REPLACE INTO t1 SELECT * FROM t1 LIMIT 1;

  UPDATE t1 SET a=1 LIMIT 1;

  DELETE FROM t1 LIMIT 1;

END|

delimiter ;|

CALL p1();

DROP PROCEDURE p1;

DROP TABLE t1;

mysql-test/t/federated.test

+7 −0
Original line number Diff line number Diff line
@@ -1816,5 +1816,12 @@ DROP TABLE t1; 
connection slave;

DROP TABLE t1;



#

# BUG#34788 - malformed federated connection url is not handled correctly -

#             crashes server !

#

CREATE TABLE t1 (a INT) ENGINE=federated CONNECTION='mysql://@:://';

DROP TABLE t1;



--echo End of 5.1 tests

source include/federated_cleanup.inc;