bk commit into 5.0 tree (jimw:1.2289)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-28 10:08:03-07:00, jimw@rama.(none) +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-connectors
  into  rama.(none):/home/jimw/my/mysql-5.0-more-tests
  MERGE: 1.2244.29.2

  BitKeeper/etc/ignore@stripped, 2006-09-28 10:07:53-07:00, jimw@rama.(none) +1 -1
    auto-union
    MERGE: 1.229.1.1

  Makefile.am@stripped, 2006-09-28 10:08:00-07:00, jimw@rama.(none) +0 -0
    Auto merged
    MERGE: 1.83.1.1

  mysql-test/mysql-test-run.pl@stripped, 2006-09-28 10:08:00-07:00, jimw@rama.(none) +0 -0
    Auto merged
    MERGE: 1.111.2.2

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-more-tests/RESYNC

--- 1.84/Makefile.am	2006-09-28 10:08:07 -07:00
+++ 1.85/Makefile.am	2006-09-28 10:08:07 -07:00
@@ -125,6 +125,9 @@
 	./mysql-test-run.pl --force && \
 	./mysql-test-run.pl --ps-protocol --force
 
+test-connectors:
+	cd mysql-test; ./mysql-test-run.pl --suite=connectors
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%
 

--- 1.115/mysql-test/mysql-test-run.pl	2006-09-28 10:08:07 -07:00
+++ 1.116/mysql-test/mysql-test-run.pl	2006-09-28 10:08:07 -07:00
@@ -417,6 +417,7 @@
     snapshot_setup();
     initialize_servers();
 
+    initialize_suite($opt_suite);
     run_suite($opt_suite, $tests);
   }
 
@@ -1642,6 +1643,24 @@
 }
 
 
+# Initialize the test suite -- look for mysql-test/<suite>/init.pl and run
+# it if it exists
+sub initialize_suite {
+  my ($suite)= @_;
+  my ($init)= $suite eq 'main' ?
+              "$::glob_mysql_test_dir/init.pl" :
+              "$::glob_mysql_test_dir/suite/$suite/init.pl";
+
+  if (-f $init) {
+    mtr_report("Initializing '$suite' suite");
+    unless (my $ret= do $init) {
+      warn "couldn't parse $init: $@" if $@;
+      warn "couldn't do $init: $!"    unless defined $ret;
+      warn "couldn't run $init"       unless $ret;
+    }
+  }
+}
+
 ##############################################################################
 #
 #  Run the test suite
@@ -2149,6 +2168,7 @@
   if ( $opt_start_and_exit or $opt_start_dirty )
   {
     mtr_report("\nServers started, exiting");
+    mtr_timer_stop_all($glob_timers);
     exit(0);
   }
 

--- 1.233/BitKeeper/etc/ignore	2006-09-28 10:08:07 -07:00
+++ 1.234/BitKeeper/etc/ignore	2006-09-28 10:08:07 -07:00
@@ -762,6 +762,7 @@
 mysql-test/r/udf.log
 mysql-test/share/mysql
 mysql-test/std_data/*.pem
+mysql-test/suite/connectors/ruby-mysql.tar.gz
 mysql-test/t/index_merge.load
 mysql-test/var
 mysql-test/var/*