database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

BUG#39853: lowercase_table3 fails on powermacg5 in rpl tree

Browse Source 
Problem: during a refactoring of mtr, a pattern for suppressing a warning from lowercase_table3 was lost.
Fix: re-introduce the suppression.
Problem 2: suppression was misspelt as supression. Fixed by adding a p.


mysql-test/include/mtr_warnings.sql:
  fixed spelling error
mysql-test/suite/rpl/t/rpl_bug33931.test:
  fixed spelling error
mysql-test/suite/rpl/t/rpl_idempotency.test:
  fixed spelling error
mysql-test/suite/rpl/t/rpl_temporary.test:
  fixed spelling error
mysql-test/suite/rpl/t/rpl_temporary_errors.test:
  fixed spelling error
mysql-test/t/lowercase_table3.test:
  fixed spelling error
This commit is contained in:
Sven Sandberg
2008-10-13 20:33:08 +02:00
parent 906fc6bb95
commit 4e09e915ca
12 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mysql-test/include/mtr_warnings.sql
View File

@ -42,9 +42,9 @@ INSERT INTO suspicious_patterns VALUES
--
-- Create table where testcases can insert patterns to
-- be supressed
-- be suppressed
--
CREATE TABLE test_supressions (
CREATE TABLE test_suppressions (
pattern VARCHAR(255)
) ENGINE=MyISAM||
@ -52,11 +52,11 @@ CREATE TABLE test_supressions (
--
-- Declare a trigger that makes sure
-- no invalid patterns can be inserted
-- into test_supressions
-- into test_suppressions
--
/*!50002
CREATE DEFINER=root@localhost TRIGGER ts_insert
BEFORE INSERT ON test_supressions
BEFORE INSERT ON test_suppressions
FOR EACH ROW BEGIN
DECLARE dummy INT;
SELECT "" REGEXP NEW.pattern INTO dummy;
@ -65,20 +65,20 @@ END
--
-- Load table with patterns that will be supressed globally(always)
-- Load table with patterns that will be suppressed globally(always)
--
CREATE TABLE global_supressions (
CREATE TABLE global_suppressions (
pattern VARCHAR(255)
) ENGINE=MyISAM||
-- Declare a trigger that makes sure
-- no invalid patterns can be inserted
-- into global_supressions
-- into global_suppressions
--
/*!50002
CREATE DEFINER=root@localhost TRIGGER gs_insert
BEFORE INSERT ON global_supressions
BEFORE INSERT ON global_suppressions
FOR EACH ROW BEGIN
DECLARE dummy INT;
SELECT "" REGEXP NEW.pattern INTO dummy;
@ -88,9 +88,9 @@ END
--
-- Insert patterns that should always be supressed
-- Insert patterns that should always be suppressed
--
INSERT INTO global_supressions VALUES
INSERT INTO global_suppressions VALUES
("'SELECT UNIX_TIMESTAMP\\(\\)' failed on master"),
("Aborted connection"),
("Client requested master to start replication from impossible position"),
@ -256,28 +256,28 @@ BEGIN
DELETE FROM error_log WHERE row < @max_row;
CREATE TEMPORARY TABLE suspect_lines ENGINE=MyISAM AS
SELECT DISTINCT el.line, 0 as "supressed"
SELECT DISTINCT el.line, 0 as "suppressed"
FROM error_log el, suspicious_patterns ep
WHERE el.line REGEXP ep.pattern;
-- Mark lines that are supressed by global supressions
UPDATE suspect_lines sl, global_supressions gs
SET supressed=1
-- Mark lines that are suppressed by global suppressions
UPDATE suspect_lines sl, global_suppressions gs
SET suppressed=1
WHERE sl.line REGEXP gs.pattern;
-- Mark lines that are supressed by test specific supressions
UPDATE suspect_lines sl, test_supressions ts
SET supressed=2
-- Mark lines that are suppressed by test specific suppressions
UPDATE suspect_lines sl, test_suppressions ts
SET suppressed=2
WHERE sl.line REGEXP ts.pattern;
SELECT COUNT(*) INTO @num_warnings FROM suspect_lines
WHERE supressed=0;
WHERE suppressed=0;
IF @num_warnings > 0 THEN
SELECT @log_error;
SELECT line as log_error
FROM suspect_lines WHERE supressed=0;
--SELECT * FROM test_supressions;
FROM suspect_lines WHERE suppressed=0;
--SELECT * FROM test_suppressions;
-- Return 2 -> check failed
SELECT 2 INTO result;
ELSE
@ -286,19 +286,19 @@ BEGIN
END IF;
-- Cleanup for next test
TRUNCATE test_supressions;
TRUNCATE test_suppressions;
END||
--
-- Declare a procedure testcases can use to insert test
-- specific supressions
-- specific suppressions
--
/*!50001
CREATE DEFINER=root@localhost
PROCEDURE add_supression(pattern VARCHAR(255))
PROCEDURE add_suppression(pattern VARCHAR(255))
BEGIN
INSERT INTO test_supressions (pattern) VALUES (pattern);
INSERT INTO test_suppressions (pattern) VALUES (pattern);
END
*/||

16
mysql-test/r/mysql_upgrade.result
View File

@ -1,7 +1,7 @@
Run mysql_upgrade once
mtr.global_supressions OK
mtr.global_suppressions OK
mtr.suspicious_patterns OK
mtr.test_supressions OK
mtr.test_suppressions OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK
@ -32,9 +32,9 @@ mysql.user OK
Run it again - should say already completed
This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade
Force should run it regardless of wether it's been run before
mtr.global_supressions OK
mtr.global_suppressions OK
mtr.suspicious_patterns OK
mtr.test_supressions OK
mtr.test_suppressions OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK
@ -65,9 +65,9 @@ mysql.user OK
CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila';
GRANT ALL ON *.* TO mysqltest1@'%';
Run mysql_upgrade with password protected account
mtr.global_supressions OK
mtr.global_suppressions OK
mtr.suspicious_patterns OK
mtr.test_supressions OK
mtr.test_suppressions OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK
@ -100,9 +100,9 @@ Run mysql_upgrade with a non existing server socket
mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
FATAL ERROR: Upgrade failed
set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
mtr.global_supressions OK
mtr.global_suppressions OK
mtr.suspicious_patterns OK
mtr.test_supressions OK
mtr.test_suppressions OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK

4
mysql-test/r/mysqlcheck.result
View File

@ -1,9 +1,9 @@
DROP TABLE IF EXISTS t1, `t``1`, `t 1`;
drop view if exists v1;
drop database if exists client_test_db;
mtr.global_supressions OK
mtr.global_suppressions OK
mtr.suspicious_patterns OK
mtr.test_supressions OK
mtr.test_suppressions OK
mysql.columns_priv OK
mysql.db OK
mysql.event OK

2
mysql-test/suite/rpl/r/rpl_bug33931.result
View File

@ -1,5 +1,5 @@
reset master;
call mtr.add_supression("Failed during slave.*thread initialization");
call mtr.add_suppression("Failed during slave.*thread initialization");
stop slave;
reset slave;
SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";

4
mysql-test/suite/rpl/r/rpl_idempotency.result
View File

@ -4,8 +4,8 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
call mtr.add_supression("Slave: Can\'t find record in \'t1\' Error_code: 1032");
call mtr.add_supression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452");
call mtr.add_suppression("Slave: Can\'t find record in \'t1\' Error_code: 1032");
call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452");
CREATE TABLE t1 (a INT PRIMARY KEY);
CREATE TABLE t2 (a INT);
INSERT INTO t1 VALUES (-1),(-2),(-3);

2
mysql-test/suite/rpl/r/rpl_temporary.result
View File

@ -4,7 +4,7 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
call mtr.add_supression("Slave: Can\'t find record in \'user\' Error_code: 1032");
call mtr.add_suppression("Slave: Can\'t find record in \'user\' Error_code: 1032");
reset master;
SET @save_select_limit=@@session.sql_select_limit;
SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100;

2
mysql-test/suite/rpl/r/rpl_temporary_errors.result
View File

@ -4,7 +4,7 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
call mtr.add_supression("Deadlock found");
call mtr.add_suppression("Deadlock found");
**** On Master ****
SET SESSION BINLOG_FORMAT=ROW;
CREATE TABLE t1 (a INT PRIMARY KEY, b INT);

4
mysql-test/suite/rpl/t/rpl_bug33931.test
View File

@ -14,8 +14,8 @@ reset master;
connection slave;
# Add supression for expected warnings in slaves error log
call mtr.add_supression("Failed during slave.*thread initialization");
# Add suppression for expected warnings in slaves error log
call mtr.add_suppression("Failed during slave.*thread initialization");
--disable_warnings
stop slave;

6
mysql-test/suite/rpl/t/rpl_idempotency.test
View File

@ -7,9 +7,9 @@ source include/have_innodb.inc;
connection slave;
source include/have_innodb.inc;
# Add supression for expected warning(s) in slaves error log
call mtr.add_supression("Slave: Can\'t find record in \'t1\' Error_code: 1032");
call mtr.add_supression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452");
# Add suppression for expected warning(s) in slaves error log
call mtr.add_suppression("Slave: Can\'t find record in \'t1\' Error_code: 1032");
call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452");
connection master;
CREATE TABLE t1 (a INT PRIMARY KEY);

4
mysql-test/suite/rpl/t/rpl_temporary.test
View File

@ -17,8 +17,8 @@ source include/add_anonymous_users.inc;
save_master_pos;
connection slave;
# Add supression for expected warning(s) in slaves error log
call mtr.add_supression("Slave: Can\'t find record in \'user\' Error_code: 1032");
# Add suppression for expected warning(s) in slaves error log
call mtr.add_suppression("Slave: Can\'t find record in \'user\' Error_code: 1032");
sync_with_master;
reset master;

2
mysql-test/suite/rpl/t/rpl_temporary_errors.test
View File

@ -1,6 +1,6 @@
source include/master-slave.inc;
call mtr.add_supression("Deadlock found");
call mtr.add_suppression("Deadlock found");
--echo **** On Master ****
connection master;

2
mysql-test/t/lowercase_table3.test
View File

@ -9,6 +9,8 @@
--source include/have_case_insensitive_file_system.inc
--source include/not_windows.inc
call mtr.add_suppression("Cannot find or open table test/BUG29839 from");
--disable_warnings
DROP TABLE IF EXISTS t1,T1;
--enable_warnings