[Commits] Rev 3130: remove few obscure, unused, or misused mtr features in http://bazaar.launchpad.net/~maria-captains/maria/5.1/

serg at askmonty.org serg at askmonty.org
Tue Jan 24 21:00:45 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.1/

------------------------------------------------------------
revno: 3130
revision-id: sergii at pisem.net-20120124190036-me5389ofq4et4txp
parent: sergii at pisem.net-20120124140839-iziwgt30gaalsiw9
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.1
timestamp: Tue 2012-01-24 20:00:36 +0100
message:
  remove few obscure, unused, or misused mtr features
-------------- next part --------------
=== removed file 'mysql-test/include/force_restart_if_skipped.inc'
--- a/mysql-test/include/force_restart_if_skipped.inc	2010-12-19 17:07:28 +0000
+++ b/mysql-test/include/force_restart_if_skipped.inc	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# ==== Purpose ====
-#
-# Tell mtr that all servers must be restarted in case the test is
-# skipped.
-#
-# ==== Usage ====
-#
-# --source include/force_restart_if_skipped.inc
-#
-# ==== See also ====
-#
-# include/force_restart.inc
-
---let $_force_restart_datadir= `SELECT @@datadir`
---append_file $_force_restart_datadir/mtr/force_restart_if_skipped
-1
-EOF

=== modified file 'mysql-test/include/mtr_check.sql'
--- a/mysql-test/include/mtr_check.sql	2011-11-23 17:32:14 +0000
+++ b/mysql-test/include/mtr_check.sql	2012-01-24 19:00:36 +0000
@@ -77,12 +77,3 @@ BEGIN
 
 END||
 
---
--- Procedure used by test case used to force all
--- servers to restart after testcase and thus skipping
--- check test case after test
---
-CREATE DEFINER=root at localhost PROCEDURE force_restart()
-BEGIN
-  SELECT 1 INTO OUTFILE 'force_restart';
-END||

=== modified file 'mysql-test/include/rpl_init.inc'
--- a/mysql-test/include/rpl_init.inc	2010-12-19 17:07:28 +0000
+++ b/mysql-test/include/rpl_init.inc	2012-01-24 19:00:36 +0000
@@ -189,13 +189,6 @@ while ($_rpl_server)
 # Signal that initialization is done and all connections created.
 --let $rpl_inited= 1
 
-# Signal that the server is in a dirty state and needs to be restarted
-# if the test is skipped. If the test is not skipped, it will continue
-# to the end and execute its cleanup section (and check-testcase will
-# report if you forget to clean up).
---source include/force_restart_if_skipped.inc
-
-
 # Assert that all hosts have different server_ids
 if ($rpl_check_server_ids)
 {

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2012-01-24 14:08:39 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2012-01-24 19:00:36 +0000
@@ -677,23 +677,6 @@ sub process_opts {
       next;
     }
 
-    $value= mtr_match_prefix($opt, "--result-file=");
-    if ( defined $value )
-    {
-      # Specifies the file mysqltest should compare
-      # output against
-      $tinfo->{'result_file'}= "r/$value.result";
-      next;
-    }
-
-    $value= mtr_match_prefix($opt, "--config-file-template=");
-    if ( defined $value)
-    {
-      # Specifies the configuration file to use for this test
-      $tinfo->{'template_path'}= dirname($tinfo->{path})."/$value";
-      next;
-    }
-
     # If we set default time zone, remove the one we have
     $value= mtr_match_prefix($opt, "--default-time-zone=");
     if ( defined $value )
@@ -713,13 +696,6 @@ sub process_opts {
       next;
     }
 
-    $value= mtr_match_prefix($opt, "--testcase-timeout=");
-    if ( defined $value ) {
-      # Overrides test case timeout for this test
-      $tinfo->{'case-timeout'}= $value;
-      next;
-    }
-
     # Ok, this was a real option, add it
     push(@{$tinfo->{$opt_name}}, $opt);
   }

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-01-24 12:53:57 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-01-24 19:00:36 +0000
@@ -4107,8 +4107,7 @@ sub run_testcase ($$) {
 	find_testcase_skipped_reason($tinfo);
 	mtr_report_test_skipped($tinfo);
 	# Restart if skipped due to missing perl, it may have had side effects
-	if ( restart_forced_by_test('force_restart_if_skipped') ||
-             $tinfo->{'comment'} =~ /^perl not found/ )
+	if ( $tinfo->{'comment'} =~ /^perl not found/ )
 	{
 	  stop_all_servers($opt_shutdown_timeout);
 	}

=== modified file 'mysql-test/suite/binlog/t/binlog_index-master.opt'
--- a/mysql-test/suite/binlog/t/binlog_index-master.opt	2011-02-20 16:51:43 +0000
+++ b/mysql-test/suite/binlog/t/binlog_index-master.opt	2012-01-24 19:00:36 +0000
@@ -1 +1 @@
---force-restart --skip-stack-trace --test-expect-abort --log-warnings=0
+--skip-stack-trace --test-expect-abort --log-warnings=0

=== modified file 'mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt'
--- a/mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt	2010-11-05 14:26:38 +0000
+++ b/mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt	2012-01-24 19:00:36 +0000
@@ -1,2 +1 @@
--O max_binlog_size=4096
---force-restart
+--max_binlog_size=4096

=== modified file 'mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt'
--- a/mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt	2010-11-05 14:26:38 +0000
+++ b/mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt	2012-01-24 19:00:36 +0000
@@ -1,2 +1 @@
 --binlog-do-db=b42829
---force-restart

=== removed file 'mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance-master.opt'
--- a/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance-master.opt	2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== removed file 'mysql-test/suite/engines/funcs/t/rpl_empty_master_crash-master.opt'
--- a/mysql-test/suite/engines/funcs/t/rpl_empty_master_crash-master.opt	2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/rpl_empty_master_crash-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== removed file 'mysql-test/suite/maria/t/maria_showlog_error-master.opt'
--- a/mysql-test/suite/maria/t/maria_showlog_error-master.opt	2009-10-13 12:47:17 +0000
+++ b/mysql-test/suite/maria/t/maria_showlog_error-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== removed file 'mysql-test/suite/pbxt/t/skip_name_resolve-master.opt'
--- a/mysql-test/suite/pbxt/t/skip_name_resolve-master.opt	2010-08-06 12:39:37 +0000
+++ b/mysql-test/suite/pbxt/t/skip_name_resolve-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== modified file 'mysql-test/suite/rpl/t/rpl_000017.test'
--- a/mysql-test/suite/rpl/t/rpl_000017.test	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_000017.test	2012-01-24 19:00:36 +0000
@@ -45,4 +45,3 @@ delete from mysql.user where user="repli
 # End of 4.1 tests
 --source include/rpl_end.inc
 
---source include/force_restart.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_cross_version-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_cross_version-master.opt	2010-11-05 14:26:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_cross_version-master.opt	2012-01-24 19:00:36 +0000
@@ -1,2 +1 @@
 --replicate-same-server-id --relay-log=slave-relay-bin --secure-file-priv=$MYSQL_TMP_DIR
---force-restart

=== removed file 'mysql-test/suite/rpl/t/rpl_current_user-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_current_user-master.opt	2010-11-05 14:26:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_current_user-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== removed file 'mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== removed file 'mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== modified file 'mysql-test/suite/rpl/t/rpl_ignore_table.test'
--- a/mysql-test/suite/rpl/t/rpl_ignore_table.test	2011-05-02 17:58:45 +0000
+++ b/mysql-test/suite/rpl/t/rpl_ignore_table.test	2012-01-24 19:00:36 +0000
@@ -182,6 +182,4 @@ connection master;
 DROP TABLE t5;
 sync_slave_with_master;
 
---source include/force_restart.inc
-
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_loadfile.test'
--- a/mysql-test/suite/rpl/t/rpl_loadfile.test	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_loadfile.test	2012-01-24 19:00:36 +0000
@@ -10,8 +10,8 @@
 ##########
 
 # Includes
--- source include/master-slave.inc
 -- source include/have_binlog_format_mixed_or_row.inc
+-- source include/master-slave.inc
 
 -- source extra/rpl_tests/rpl_loadfile.test
 

=== modified file 'mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test	2011-02-20 16:51:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test	2012-01-24 19:00:36 +0000
@@ -9,12 +9,13 @@
 -- source include/have_binlog_format_row.inc
 # Embedded server doesn't support binlogging
 -- source include/not_embedded.inc
--- source include/master-slave.inc
 # This test requires the cp932 charset compiled in
 -- source include/have_cp932.inc
 # Slow test, don't run during staging part
 -- source include/not_staging.inc
 
+-- source include/master-slave.inc
+
 # Setup Section
 # we need this for getting fixed timestamps inside of this test
 

=== modified file 'mysql-test/suite/rpl/t/rpl_show_slave_running.test'
--- a/mysql-test/suite/rpl/t/rpl_show_slave_running.test	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_show_slave_running.test	2012-01-24 19:00:36 +0000
@@ -3,9 +3,9 @@
 # The test verifies that  SHOW STATUS LIKE 'Slave_running' displays ON
 # if and only if `SHOW SLAVE STATUS' displays YES for Slave_IO_Running and  Slave_SQL_Running
 #
-source include/master-slave.inc;
 source include/have_debug.inc;
 source include/have_debug_sync.inc;
+source include/master-slave.inc;
 
 connection slave;
 SET DEBUG_SYNC= 'RESET';

=== removed file 'mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt	2010-11-05 14:26:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== modified file 'mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt	2010-02-05 17:01:09 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt	2012-01-24 19:00:36 +0000
@@ -1 +1 @@
---force-restart --log-slow-slave-statements --log-slow-queries
+--log-slow-slave-statements --log-slow-queries

=== removed file 'mysql-test/suite/rpl/t/rpl_stm_log-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_stm_log-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_log-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== removed file 'mysql-test/suite/rpl/t/rpl_stm_until-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_stm_until-master.opt	2011-02-20 16:51:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_until-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== modified file 'mysql-test/suite/rpl/t/rpl_variables.test'
--- a/mysql-test/suite/rpl/t/rpl_variables.test	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_variables.test	2012-01-24 19:00:36 +0000
@@ -60,8 +60,8 @@
 # actually can be replicated safely in statement mode.
 
 
-source include/master-slave.inc;
 source include/have_binlog_format_mixed_or_row.inc;
+source include/master-slave.inc;
 
 
 --echo ==== Initialization ====

=== removed file 'mysql-test/t/change_user-master.opt'
--- a/mysql-test/t/change_user-master.opt	2009-01-15 11:58:32 +0000
+++ b/mysql-test/t/change_user-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== modified file 'mysql-test/t/key_cache-master.opt'
--- a/mysql-test/t/key_cache-master.opt	2010-11-05 14:26:38 +0000
+++ b/mysql-test/t/key_cache-master.opt	2012-01-24 19:00:36 +0000
@@ -1,2 +1 @@
 --key_buffer_size=2M --small.key_buffer_size=256K --small.key_buffer_size=128K
---force-restart

=== modified file 'mysql-test/t/mysqlbinlog-master.opt'
--- a/mysql-test/t/mysqlbinlog-master.opt	2010-11-05 14:26:38 +0000
+++ b/mysql-test/t/mysqlbinlog-master.opt	2012-01-24 19:00:36 +0000
@@ -1,2 +1 @@
 --max-binlog-size=4096
---force-restart

=== removed file 'mysql-test/t/not_embedded_server-master.opt'
--- a/mysql-test/t/not_embedded_server-master.opt	2006-10-11 12:50:19 +0000
+++ b/mysql-test/t/not_embedded_server-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---force-restart

=== removed file 'mysql-test/t/system_mysql_db_fix30020-master.opt'
--- a/mysql-test/t/system_mysql_db_fix30020-master.opt	2006-11-21 14:31:11 +0000
+++ b/mysql-test/t/system_mysql_db_fix30020-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---result-file=system_mysql_db

=== removed file 'mysql-test/t/system_mysql_db_fix40123-master.opt'
--- a/mysql-test/t/system_mysql_db_fix40123-master.opt	2006-11-21 14:31:11 +0000
+++ b/mysql-test/t/system_mysql_db_fix40123-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---result-file=system_mysql_db

=== removed file 'mysql-test/t/system_mysql_db_fix50030-master.opt'
--- a/mysql-test/t/system_mysql_db_fix50030-master.opt	2006-11-21 16:44:43 +0000
+++ b/mysql-test/t/system_mysql_db_fix50030-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---result-file=system_mysql_db

=== removed file 'mysql-test/t/system_mysql_db_fix50117-master.opt'
--- a/mysql-test/t/system_mysql_db_fix50117-master.opt	2007-05-19 16:55:38 +0000
+++ b/mysql-test/t/system_mysql_db_fix50117-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---result-file=system_mysql_db



More information about the commits mailing list