#At file:///media/sda3/work/mysql/bzrwork/pbfix/6.0-rpl/
2714 He Zhenxing 2008-10-29
In the patch of BUG#39853, the spelling of add_supression was corrected,
this patch fixed more tests that misspelled add_suppression.
modified:
mysql-test/r/backup_tablespace.result
mysql-test/r/maria-recover.result
mysql-test/r/maria-recovery2.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
mysql-test/t/backup_backupdir.test
mysql-test/t/backup_concurrent.test
mysql-test/t/backup_db_grants.test
mysql-test/t/backup_errors.test
mysql-test/t/backup_myisam1.test
mysql-test/t/backup_security.test
mysql-test/t/backup_tablespace.test
mysql-test/t/backup_views.test
mysql-test/t/maria-recover.test
mysql-test/t/maria-recovery2.test
mysql-test/t/timezone2.test
=== modified file 'mysql-test/r/backup_tablespace.result'
--- a/mysql-test/r/backup_tablespace.result 2008-10-07 10:26:19 +0000
+++ b/mysql-test/r/backup_tablespace.result 2008-10-29 03:09:14 +0000
@@ -1,4 +1,4 @@
-call mtr.add_supression("Restore: Tablespace .* needed by tables being restored has changed on the server");
+call mtr.add_suppression("Restore: Tablespace .* needed by tables being restored has changed on the server");
DROP TABLE IF EXISTS backup_ts.not_ts;
DROP TABLE IF EXISTS backup_ts.has_ts;
DROP DATABASE IF EXISTS backup_ts;
=== modified file 'mysql-test/r/maria-recover.result'
--- a/mysql-test/r/maria-recover.result 2008-08-05 11:20:20 +0000
+++ b/mysql-test/r/maria-recover.result 2008-10-29 03:09:14 +0000
@@ -1,6 +1,6 @@
-call mtr.add_supression("Checking table: '.\/mysqltest\/t_corrupted2'");
-call mtr.add_supression("Recovering table: '.\/mysqltest\/t_corrupted2'");
-call mtr.add_supression("Table '.\/mysqltest\/t_corrupted2' is marked as crashed and should be repaired");
+call mtr.add_suppression("Checking table: '.\/mysqltest\/t_corrupted2'");
+call mtr.add_suppression("Recovering table: '.\/mysqltest\/t_corrupted2'");
+call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted2' is marked as crashed and should be repaired");
select @@global.maria_recover;
@@global.maria_recover
BACKUP
=== modified file 'mysql-test/r/maria-recovery2.result'
--- a/mysql-test/r/maria-recovery2.result 2008-07-24 18:26:12 +0000
+++ b/mysql-test/r/maria-recovery2.result 2008-10-29 03:09:14 +0000
@@ -1,5 +1,5 @@
-call mtr.add_supression("File '.*maria_log.000.*' not found \\(Errcode: 2\\)");
-call mtr.add_supression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with maria_chk -r");
+call mtr.add_suppression("File '.*maria_log.000.*' not found \\(Errcode: 2\\)");
+call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with maria_chk -r");
set global maria_log_file_size=4294967295;
drop database if exists mysqltest;
create database mysqltest;
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result 2008-08-04 14:30:50 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result 2008-10-29 03:09:14 +0000
@@ -127,7 +127,7 @@ select count(*) from t1;
count(*)
12
DROP table t1;
-call mtr.add_supression("Slave: Got error 146 during COMMIT Error_code: 1180");
+call mtr.add_suppression("Slave: Got error 146 during COMMIT Error_code: 1180");
CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0',
`nom` char(4) default NULL,
`prenom` char(4) default NULL,
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test 2008-08-04 14:30:50 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test 2008-10-29 03:09:14 +0000
@@ -160,8 +160,8 @@ DROP table t1;
#
-# Add supressions for warnings generated by this test
-call mtr.add_supression("Slave: Got error 146 during COMMIT Error_code: 1180");
+# Add suppressions for warnings generated by this test
+call mtr.add_suppression("Slave: Got error 146 during COMMIT Error_code: 1180");
#
# 1. Deadlock
=== modified file 'mysql-test/t/backup_backupdir.test'
--- a/mysql-test/t/backup_backupdir.test 2008-10-07 10:26:19 +0000
+++ b/mysql-test/t/backup_backupdir.test 2008-10-29 03:09:14 +0000
@@ -6,8 +6,8 @@
# Suppress warning about expected backup/restore errors
disable_query_log;
-call mtr.add_supression("Backup:");
-call mtr.add_supression("Restore:");
+call mtr.add_suppression("Backup:");
+call mtr.add_suppression("Restore:");
enable_query_log;
let $MYSQLD_DATADIR= `select @@datadir`;
=== modified file 'mysql-test/t/backup_concurrent.test'
--- a/mysql-test/t/backup_concurrent.test 2008-09-04 03:21:22 +0000
+++ b/mysql-test/t/backup_concurrent.test 2008-10-29 03:09:14 +0000
@@ -8,8 +8,8 @@
# Suppress warning about expected backup/restore errors
disable_query_log;
-call mtr.add_supression("Backup:");
-call mtr.add_supression("Restore:");
+call mtr.add_suppression("Backup:");
+call mtr.add_suppression("Restore:");
enable_query_log;
#Create Database and object view for this test.
=== modified file 'mysql-test/t/backup_db_grants.test'
--- a/mysql-test/t/backup_db_grants.test 2008-09-12 03:44:49 +0000
+++ b/mysql-test/t/backup_db_grants.test 2008-10-29 03:09:14 +0000
@@ -6,8 +6,8 @@
--source include/have_sjis.inc
disable_query_log;
-call mtr.add_supression("Backup:");
-call mtr.add_supression("Restore:");
+call mtr.add_suppression("Backup:");
+call mtr.add_suppression("Restore:");
enable_query_log;
let MYSQLD_DATADIR= `select @@datadir`;
=== modified file 'mysql-test/t/backup_errors.test'
--- a/mysql-test/t/backup_errors.test 2008-10-10 09:42:05 +0000
+++ b/mysql-test/t/backup_errors.test 2008-10-29 03:09:14 +0000
@@ -8,10 +8,10 @@
# contains appropriate rows when errors have been detected.
disable_query_log;
-call mtr.add_supression("Backup:");
-call mtr.add_supression("Restore:");
-call mtr.add_supression("Can't open the online backup progress tables");
-call mtr.add_supression("Can't open the backup log tables");
+call mtr.add_suppression("Backup:");
+call mtr.add_suppression("Restore:");
+call mtr.add_suppression("Can't open the online backup progress tables");
+call mtr.add_suppression("Can't open the backup log tables");
enable_query_log;
--disable_warnings
=== modified file 'mysql-test/t/backup_myisam1.test'
--- a/mysql-test/t/backup_myisam1.test 2008-08-04 14:30:50 +0000
+++ b/mysql-test/t/backup_myisam1.test 2008-10-29 03:09:14 +0000
@@ -4,8 +4,8 @@
--source include/not_embedded.inc
disable_query_log;
-call mtr.add_supression("Backup:");
-call mtr.add_supression("Restore:");
+call mtr.add_suppression("Backup:");
+call mtr.add_suppression("Restore:");
enable_query_log;
#
=== modified file 'mysql-test/t/backup_security.test'
--- a/mysql-test/t/backup_security.test 2008-08-04 14:30:50 +0000
+++ b/mysql-test/t/backup_security.test 2008-10-29 03:09:14 +0000
@@ -8,8 +8,8 @@
--source include/not_embedded.inc
disable_query_log;
-call mtr.add_supression("Backup:");
-call mtr.add_supression("Restore:");
+call mtr.add_suppression("Backup:");
+call mtr.add_suppression("Restore:");
enable_query_log;
--disable_warnings
=== modified file 'mysql-test/t/backup_tablespace.test'
--- a/mysql-test/t/backup_tablespace.test 2008-06-10 22:27:52 +0000
+++ b/mysql-test/t/backup_tablespace.test 2008-10-29 03:09:14 +0000
@@ -8,7 +8,7 @@
--source include/have_falcon.inc
--source include/not_embedded.inc
-call mtr.add_supression("Restore: Tablespace .* needed by tables being restored has changed on the server");
+call mtr.add_suppression("Restore: Tablespace .* needed by tables being restored has changed on the server");
let $MYSQLD_DATADIR=`select @@datadir`;
=== modified file 'mysql-test/t/backup_views.test'
--- a/mysql-test/t/backup_views.test 2008-09-11 22:32:15 +0000
+++ b/mysql-test/t/backup_views.test 2008-10-29 03:09:14 +0000
@@ -12,8 +12,8 @@ connect (breakpoints,localhost,root,,);
# Suppress warning about expected backup/restore errors
disable_query_log;
-call mtr.add_supression("Backup:");
-call mtr.add_supression("Restore:");
+call mtr.add_suppression("Backup:");
+call mtr.add_suppression("Restore:");
enable_query_log;
##############################################################
=== modified file 'mysql-test/t/maria-recover.test'
--- a/mysql-test/t/maria-recover.test 2008-08-05 11:20:20 +0000
+++ b/mysql-test/t/maria-recover.test 2008-10-29 03:09:14 +0000
@@ -2,9 +2,9 @@
--source include/have_maria.inc
-call mtr.add_supression("Checking table: '.\/mysqltest\/t_corrupted2'");
-call mtr.add_supression("Recovering table: '.\/mysqltest\/t_corrupted2'");
-call mtr.add_supression("Table '.\/mysqltest\/t_corrupted2' is marked as crashed and should be repaired");
+call mtr.add_suppression("Checking table: '.\/mysqltest\/t_corrupted2'");
+call mtr.add_suppression("Recovering table: '.\/mysqltest\/t_corrupted2'");
+call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted2' is marked as crashed and should be repaired");
# Note: we're setting an environment variable (not prefixing it by $),
# so that the perl code below can access it.
=== modified file 'mysql-test/t/maria-recovery2.test'
--- a/mysql-test/t/maria-recovery2.test 2008-07-24 18:26:12 +0000
+++ b/mysql-test/t/maria-recovery2.test 2008-10-29 03:09:14 +0000
@@ -5,8 +5,8 @@
--source include/have_debug.inc
--source include/have_maria.inc
-call mtr.add_supression("File '.*maria_log.000.*' not found \\(Errcode: 2\\)");
-call mtr.add_supression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with maria_chk -r");
+call mtr.add_suppression("File '.*maria_log.000.*' not found \\(Errcode: 2\\)");
+call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with maria_chk -r");
set global maria_log_file_size=4294967295;
let $MARIA_LOG=../../tmp;
=== modified file 'mysql-test/t/timezone2.test'
--- a/mysql-test/t/timezone2.test 2008-07-10 16:09:39 +0000
+++ b/mysql-test/t/timezone2.test 2008-10-29 03:09:14 +0000
@@ -264,7 +264,7 @@ INSERT INTO t1 VALUES (NULL), (NULL);
LOCK TABLES t1 WRITE;
# The following two queries should not return error that time zone
-# tables aren't locked. We use IS NULL below to supress timestamp
+# tables aren't locked. We use IS NULL below to suppress timestamp
# result.
SELECT CONVERT_TZ(NOW(), 'UTC', 'Europe/Moscow') IS NULL;
UPDATE t1 SET t = CONVERT_TZ(t, 'UTC', 'Europe/Moscow');
| Thread |
|---|
| • bzr commit into mysql-6.0-rpl branch (hezx:2714) Bug#39853 | He Zhenxing | 29 Oct |
