bk commit into 5.1 tree (ted:1.2348)

[Vladimir Shebordaev]

Below is the list of changes that have just been committed into a local
5.1 repository of ted. When ted 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-11-08 06:16:12+03:00, ted@stripped +4 -0
  Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint
  into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.1698.170

  mysql-test/mysql-test-run.pl@stripped, 2006-11-08 06:16:07+03:00, ted@stripped +0 -0
    Auto merged
    MERGE: 1.30.1.116

  mysql-test/r/im_daemon_life_cycle.result@stripped, 2006-11-08 06:16:07+03:00, ted@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.6

  mysql-test/t/im_daemon_life_cycle.imtest@stripped, 2006-11-08 06:16:08+03:00, ted@stripped +0 -0
    Auto merged
    MERGE: 1.1.1.7

  vio/viosslfactories.c@stripped, 2006-11-08 06:16:08+03:00, ted@stripped +0 -0
    Auto merged
    MERGE: 1.26.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:	ted
# Host:	ted.mysql.internal
# Root:	/home/ted/src/mysql/mysql-5.1-new-maint/RESYNC

--- 1.9/mysql-test/r/im_daemon_life_cycle.result	2006-11-08 06:16:19 +03:00
+++ 1.10/mysql-test/r/im_daemon_life_cycle.result	2006-11-08 06:16:19 +03:00
@@ -18,6 +18,7 @@
 Killing the process...
 Sleeping...
 Success: the process was restarted.
+Success: server is ready to accept connection on socket.
 SHOW INSTANCE STATUS mysqld1;
 instance_name	state	version_number	version	mysqld_compatible
 mysqld1	online	VERSION_NUMBER	VERSION	no

--- 1.10/mysql-test/t/im_daemon_life_cycle.imtest	2006-11-08 06:16:19 +03:00
+++ 1.11/mysql-test/t/im_daemon_life_cycle.imtest	2006-11-08 06:16:19 +03:00
@@ -46,9 +46,12 @@
 # FIXME: START INSTANCE should be synchronous.
 --exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started
 
-# 2. Restart IM-main: kill it and IM-angel will restart it.
+# 2. Restart IM-main: kill it and IM-angel will restart it; wait for IM to
+# start accepting connections again.
 
 --exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_PATH_PID restarted 30
+
+--exec $MYSQL_TEST_DIR/t/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 30
 
 # 3. Issue some statement -- connection should be re-established.
 

--- 1.219/mysql-test/mysql-test-run.pl	2006-11-08 06:16:20 +03:00
+++ 1.220/mysql-test/mysql-test-run.pl	2006-11-08 06:16:20 +03:00
@@ -185,7 +185,7 @@
 our $opt_force;
 our $opt_reorder= 0;
 our $opt_enable_disabled;
-our $opt_mem;
+our $opt_mem= $ENV{'MTR_MEM'};
 
 our $opt_gcov;
 our $opt_gcov_err;
@@ -743,7 +743,7 @@
 
     # Use /dev/shm as the preferred location for vardir and
     # thus implicitly also tmpdir. Add other locations to list
-    my @tmpfs_locations= ("/dev/shm");
+    my @tmpfs_locations= ($opt_mem, "/dev/shm");
     # One could maybe use "mount" to find tmpfs location(s)
     foreach my $fs (@tmpfs_locations)
     {
@@ -3361,6 +3361,11 @@
   if ( $opt_valgrind_mysqld )
   {
     mtr_add_arg($args, "%s--skip-safemalloc", $prefix);
+
+    if ( $mysql_version_id < 50100 )
+    {
+      mtr_add_arg($args, "%s--skip-bdb", $prefix);
+    }
   }
 
   my $pidfile;
@@ -4643,9 +4648,9 @@
   vardir=DIR            The directory where files generated from the test run
                         is stored (default: ./var). Specifying a ramdisk or
                         tmpfs will speed up tests.
-  mem=DIR               Run testsuite in "memory" using tmpfs if
+  mem                   Run testsuite in "memory" using tmpfs if
                         available(default: /dev/shm)
-
+                        reads path from MTR_MEM environment variable
 
 Options to control what test suites or cases to run
 

--- 1.29/vio/viosslfactories.c	2006-11-08 06:16:20 +03:00
+++ 1.30/vio/viosslfactories.c	2006-11-08 06:16:20 +03:00
@@ -86,8 +86,7 @@
     if (SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0)
     {
       DBUG_PRINT("error",("unable to get certificate from '%s'\n", cert_file));
-      /* FIX stderr */
-      fprintf(stderr,"Error when connection to server using SSL:");
+      fprintf(stderr,"SSL error: ");
       ERR_print_errors_fp(stderr);
       fprintf(stderr,"Unable to get certificate from '%s'\n", cert_file);
       fflush(stderr);
@@ -100,8 +99,7 @@
     if (SSL_CTX_use_PrivateKey_file(ctx, key_file, SSL_FILETYPE_PEM) <= 0)
     {
       DBUG_PRINT("error", ("unable to get private key from '%s'\n", key_file));
-      /* FIX stderr */
-      fprintf(stderr,"Error when connection to server using SSL:");
+      fprintf(stderr,"SSL error: ");
       ERR_print_errors_fp(stderr);
       fprintf(stderr,"Unable to get private key from '%s'\n", key_file);
       fflush(stderr);
@@ -252,6 +250,7 @@
   {
     DBUG_PRINT("error", ("failed to set ciphers to use"));
     report_errors();
+    SSL_CTX_free(ssl_fd->ssl_context);
     my_free((void*)ssl_fd,MYF(0));
     DBUG_RETURN(0);
   }
@@ -264,6 +263,7 @@
     {
       DBUG_PRINT("error", ("SSL_CTX_set_default_verify_paths failed"));
       report_errors();
+      SSL_CTX_free(ssl_fd->ssl_context);
       my_free((void*)ssl_fd,MYF(0));
       DBUG_RETURN(0);
     }
@@ -273,6 +273,7 @@
   {
     DBUG_PRINT("error", ("vio_set_cert_stuff failed"));
     report_errors();
+    SSL_CTX_free(ssl_fd->ssl_context);
     my_free((void*)ssl_fd,MYF(0));
     DBUG_RETURN(0);
   }