Commit 13dc35cd authored by unknown's avatar unknown
Browse files

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
vio/viosslfactories.c:
  Auto merged
parents 56dbd44c 909603a4

include/abi_check

0 → 100644
+0 −0

Empty file added.

include/abi_check.ic

0 → 100644
+914 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/mysql-test-run.pl

+9 −4
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ our $opt_fast; 
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 @@ sub command_line_setup () { 


    # 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 @@ sub mysqld_arguments ($$$$$) { 
  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 @@ Options to control directories to use 
  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

mysql-test/r/im_daemon_life_cycle.result

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Success: the process has been started. 
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

mysql-test/r/openssl_1.result

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ drop table t1; 
mysqltest: Could not open connection 'default': 2026 SSL connection error

mysqltest: Could not open connection 'default': 2026 SSL connection error

mysqltest: Could not open connection 'default': 2026 SSL connection error

Error when connection to server using SSL:Unable to get private key from ''

SSL error: Unable to get private key from ''

mysqltest: Could not open connection 'default': 2026 SSL connection error

Error when connection to server using SSL:Unable to get certificate from ''

SSL error: Unable to get certificate from ''

mysqltest: Could not open connection 'default': 2026 SSL connection error