Commit c882b871 authored by istruewing@stella.local's avatar istruewing@stella.local
Browse files

Merge stella.local:/home2/mydev/mysql-5.1-ateam 

into  stella.local:/home2/mydev/mysql-5.1-axmrg
parents 0eff6e7b 2d44db25

mysql-test/r/federated.result

+2 −0
Original line number Diff line number Diff line
@@ -2092,6 +2092,8 @@ DROP TABLE t1; 
DROP TABLE t1;

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

DROP TABLE t1;

create server 's1' foreign data wrapper 'mysql' options (port 3306);

drop server 's1';

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 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ execute s using @a; 
prepare s from "insert into t1 select 100 limit ?";

set @a=100;

execute s using @a;

Warnings:

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

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

+28 −0
Original line number Diff line number Diff line
@@ -192,3 +192,31 @@ DROP PROCEDURE proc4; 
DROP FUNCTION  func5;

DROP PREPARE   prep6;

DROP TABLE t1, t2, t3, trigger_table, trigger_table2;

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_stm_ps.test

+1 −1
Original line number Diff line number Diff line 
# This test is to verify replication with PS



-- source include/not_embedded.inc

-- source include/have_binlog_format_mixed_or_statement.inc

-- source include/have_binlog_format_statement.inc



-- disable_query_log

reset master; # get rid of previous tests binlog

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

+21 −0
Original line number Diff line number Diff line
@@ -236,3 +236,24 @@ DROP PROCEDURE proc4; 
DROP FUNCTION  func5;

DROP PREPARE   prep6;

DROP TABLE t1, t2, t3, trigger_table, trigger_table2;

#

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