mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjusted more tests after the fix for mdev-9976.

Browse source
This commit is contained in:
Igor Babaev 2017-02-01 13:08:21 -08:00
parent b0ea044d12
commit 69114862f2
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/extra/binlog_tests/binlog_write_error.inc
View file

@ -71,7 +71,7 @@ source include/binlog_inject_error.inc;
let $query= DROP VIEW v1;
source include/binlog_inject_error.inc;
let $query= CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1;
let $query= CREATE PROCEDURE p1(OUT rows_cnt INT) SELECT count(*) INTO rows_cnt FROM t1;
source include/binlog_inject_error.inc;
let $query= DROP PROCEDURE p1;

4
mysql-test/suite/binlog/r/binlog_write_error.result
View file

@ -59,8 +59,8 @@ DROP VIEW v1;
ERROR HY000: Error writing file 'master-bin' ((errno: #)
SET GLOBAL debug_dbug='';
SET GLOBAL debug_dbug='d,injecting_fault_writing';
CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1;
CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1;
CREATE PROCEDURE p1(OUT rows_cnt INT) SELECT count(*) INTO rows_cnt FROM t1;
CREATE PROCEDURE p1(OUT rows_cnt INT) SELECT count(*) INTO rows_cnt FROM t1;
ERROR HY000: Error writing file 'master-bin' ((errno: #)
SET GLOBAL debug_dbug='';
SET GLOBAL debug_dbug='d,injecting_fault_writing';

4
mysql-test/suite/binlog_encryption/binlog_write_error.result
View file

@ -59,8 +59,8 @@ DROP VIEW v1;
ERROR HY000: Error writing file 'master-bin' ((errno: #)
SET GLOBAL debug_dbug='';
SET GLOBAL debug_dbug='d,injecting_fault_writing';
CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1;
CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1;
CREATE PROCEDURE p1(OUT rows_cnt INT) SELECT count(*) INTO rows_cnt FROM t1;
CREATE PROCEDURE p1(OUT rows_cnt INT) SELECT count(*) INTO rows_cnt FROM t1;
ERROR HY000: Error writing file 'master-bin' ((errno: #)
SET GLOBAL debug_dbug='';
SET GLOBAL debug_dbug='d,injecting_fault_writing';

10
mysql-test/suite/rpl/r/rpl_killed_ddl.result
View file

@ -34,9 +34,9 @@ ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 DAY
DO INSERT INTO test.t1 VALUES (1);
CREATE FUNCTION f1 () RETURNS INT DETERMINISTIC
RETURN 1;
CREATE PROCEDURE p1 (OUT rows INT)
CREATE PROCEDURE p1 (OUT rows_cnt INT)
BEGIN
SELECT COUNT(*) INTO rows FROM t1;
SELECT COUNT(*) INTO rows_cnt FROM t1;
END;
//
CREATE SERVER s1
@ -125,9 +125,9 @@ connection master;
include/rpl_diff.inc
connection master;
connection master1;
CREATE PROCEDURE p2 (OUT rows INT)
CREATE PROCEDURE p2 (OUT rows_cnt INT)
BEGIN
SELECT COUNT(*) INTO rows FROM t2;
SELECT COUNT(*) INTO rows_cnt FROM t2;
END;
//
source include/kill_query.inc;
@ -135,7 +135,7 @@ connection master;
include/rpl_diff.inc
connection master;
connection master1;
ALTER PROCEDURE p1 SQL SECURITY INVOKER COMMENT 'return rows of table t1';
ALTER PROCEDURE p1 SQL SECURITY INVOKER COMMENT 'return rows_cnt of table t1';
source include/kill_query.inc;
connection master;
include/rpl_diff.inc

10
mysql-test/suite/rpl/t/rpl_killed_ddl.test
View file

@ -83,9 +83,9 @@ CREATE FUNCTION f1 () RETURNS INT DETERMINISTIC
RETURN 1;
DELIMITER //;
CREATE PROCEDURE p1 (OUT rows INT)
CREATE PROCEDURE p1 (OUT rows_cnt INT)
BEGIN
SELECT COUNT(*) INTO rows FROM t1;
SELECT COUNT(*) INTO rows_cnt FROM t1;
END;
//
DELIMITER ;//
@ -203,15 +203,15 @@ source include/kill_query_and_diff_master_slave.inc;
--let $rpl_diff_statement= SHOW PROCEDURE STATUS LIKE \'p%\'
DELIMITER //;
send CREATE PROCEDURE p2 (OUT rows INT)
send CREATE PROCEDURE p2 (OUT rows_cnt INT)
BEGIN
SELECT COUNT(*) INTO rows FROM t2;
SELECT COUNT(*) INTO rows_cnt FROM t2;
END;
//
DELIMITER ;//
source include/kill_query_and_diff_master_slave.inc;
send ALTER PROCEDURE p1 SQL SECURITY INVOKER COMMENT 'return rows of table t1';
send ALTER PROCEDURE p1 SQL SECURITY INVOKER COMMENT 'return rows_cnt of table t1';
source include/kill_query_and_diff_master_slave.inc;
send DROP PROCEDURE p1;