Commit 1b93e6d8 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqlslap.result:
  Real output produced, remove "echo"
mysql-test/t/mysqlslap.test:
  Real output produced, remove "echo"
parents 874fea6d 7a793314

client/mysqltest.c

+1093 −838

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/include/have_multi_ndb.inc

+4 −4
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ disable_query_log; 
drop table if exists t1, t2;

--enable_warnings

flush tables;

@r/have_ndb.require show variables like "have_ndbcluster";

# @r/server_id.require show variables like "server_id";

--require r/have_ndb.require

show variables like "have_ndbcluster";

enable_query_log;



# Check that server2 has NDB support
@@ -20,8 +20,8 @@ disable_query_log; 
drop table if exists t1, t2;

--enable_warnings

flush tables;

@r/have_ndb.require show variables like "have_ndbcluster";

# @r/server_id1.require show variables like "server_id";

--require r/have_ndb.require

show variables like "have_ndbcluster";

enable_query_log;



# Set the default connection to 'server1'

mysql-test/include/master-slave.inc

+4 −2
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ connection slave; 
--disable_warnings

stop slave;

--enable_warnings

@r/slave-stopped.result show status like 'Slave_running';

--require r/slave-stopped.result 

show status like 'Slave_running';

connection master;

--disable_warnings

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
@@ -21,7 +22,8 @@ reset slave; 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

--enable_warnings

start slave;

@r/slave-running.result show status like 'Slave_running';

--require r/slave-running.result

show status like 'Slave_running';



# Set the default connection to 'master'

connection master;

mysql-test/include/ps_query.inc

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ execute stmt1; 


##### parameter used for keyword like SELECT (must fail)

set @arg00='SELECT' ;

# mysqltest gives no output for the next statement, Why ??

--error 1064

@arg00 a from t1 where a=1;

--error 1064

mysql-test/mysql-test-run.pl

+52 −6
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ our $path_client_bindir; 
our $path_language;

our $path_timefile;

our $path_manager_log;           # Used by mysqldadmin

our $path_mysqltest_log;

our $path_slave_load_tmpdir;     # What is this?!

our $path_my_basedir;

our $opt_vardir;                 # A path but set directly on cmd line
@@ -194,6 +195,9 @@ our $opt_ssl; 
our $opt_skip_ssl;

our $opt_ssl_supported;

our $opt_ps_protocol;

our $opt_sp_protocol;

our $opt_cursor_protocol;

our $opt_view_protocol;



our $opt_current_test;

our $opt_ddd;
@@ -269,6 +273,7 @@ our $opt_user; 
our $opt_user_test;



our $opt_valgrind;

our $opt_valgrind_mysqld;

our $opt_valgrind_mysqltest;

our $opt_valgrind_all;

our $opt_valgrind_options;
@@ -510,6 +515,9 @@ sub command_line_setup () { 
             # Control what engine/variation to run

             'embedded-server'          => \$opt_embedded_server,

             'ps-protocol'              => \$opt_ps_protocol,

             'sp-protocol'              => \$opt_sp_protocol,

             'view-protocol'            => \$opt_view_protocol,

             'cursor-protocol'          => \$opt_cursor_protocol,

             'ssl|with-openssl'         => \$opt_ssl,

             'skip-ssl'                 => \$opt_skip_ssl,

             'compress'                 => \$opt_compress,
@@ -763,6 +771,7 @@ sub command_line_setup () { 
  #   "somestring" option is name/path of valgrind executable



  # Take executable path from any of them, if any

  $opt_valgrind_mysqld= $opt_valgrind;

  $opt_valgrind= $opt_valgrind_mysqltest if $opt_valgrind_mysqltest;

  $opt_valgrind= $opt_valgrind_all       if $opt_valgrind_all;
@@ -912,6 +921,7 @@ sub command_line_setup () { 
  }



  $path_timefile=  "$opt_vardir/log/mysqltest-time";

  $path_mysqltest_log=  "$opt_vardir/log/mysqltest.log";

}
@@ -961,8 +971,20 @@ sub executable_setup () { 
		       "/usr/bin/false");

    }

    else

    {

      if ( $opt_valgrind_mysqltest )

      {

        # client/mysqltest might be a libtool .sh script, so look for real exe

        # to avoid valgrinding bash ;)

        $exe_mysqltest=

  	  mtr_exe_exists("$path_client_bindir/.libs/lt-mysqltest",

		         "$path_client_bindir/.libs/mysqltest",

		         "$path_client_bindir/mysqltest");

      }

      else

      {

        $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");

      }

      $exe_mysql_client_test=

        mtr_exe_exists("$glob_basedir/tests/mysql_client_test",

		       "/usr/bin/false");
@@ -1892,6 +1914,11 @@ sub run_testcase ($) { 
      }

      report_failure_and_restart($tinfo);

    }

    # Save info from this testcase run to mysqltest.log

    mtr_tofile($path_mysqltest_log,"CURRENT TEST $tname\n");

    my $testcase_log= mtr_fromfile($path_timefile);

    mtr_tofile($path_mysqltest_log,

	       $testcase_log);

  }



  # ----------------------------------------------------------------------
@@ -2053,7 +2080,7 @@ sub mysqld_arguments ($$$$$) { 
  mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);

  mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);



  if ( defined $opt_valgrind )

  if ( defined $opt_valgrind_mysqld )

  {

    mtr_add_arg($args, "%s--skip-safemalloc", $prefix);

    mtr_add_arg($args, "%s--skip-bdb", $prefix);
@@ -2280,7 +2307,7 @@ sub mysqld_start ($$$$) { 


  mtr_init_args(\$args);



  if ( defined $opt_valgrind )

  if ( defined $opt_valgrind_mysqld )

  {

    valgrind_arguments($args, \$exe);

  }
@@ -2633,6 +2660,21 @@ sub run_mysqltest ($) { 
    mtr_add_arg($args, "--ps-protocol");

  }



  if ( $opt_sp_protocol )

  {

    mtr_add_arg($args, "--sp-protocol");

  }



  if ( $opt_view_protocol )

  {

    mtr_add_arg($args, "--view-protocol");

  }



  if ( $opt_cursor_protocol )

  {

    mtr_add_arg($args, "--cursor-protocol");

  }



  if ( $opt_strace_client )

  {

    $exe=  "strace";            # FIXME there are ktrace, ....
@@ -2741,6 +2783,7 @@ sub valgrind_arguments { 
    mtr_add_arg($args, split(' ', $opt_valgrind_options));

  }





  mtr_add_arg($args, $$exe);



  $$exe= $opt_valgrind || "valgrind";
@@ -2764,6 +2807,10 @@ Options to control what engine/variation to run 


  embedded-server       Use the embedded server, i.e. no mysqld daemons

  ps-protocol           Use the binary protocol between client and server

  cursor-protocol       Use the cursor protocol between client and server

                        (implies --ps-protocol)

  view-protocol         Create a view to execute all non updating queries

  sp-protocol           Create a stored procedure to execute all queries

  compress              Use the compressed protocol between client and server

  ssl                   Use ssl protocol between client and server

  skip-ssl              Dont start sterver with support for ssl connections
@@ -2816,9 +2863,8 @@ Options for coverage, profiling etc 


  gcov                  FIXME

  gprof                 FIXME

  valgrind[=EXE]        Run the "mysqltest" executable as well as the "mysqld"

                        server using valgrind, optionally specifying the

                        executable path/name

  valgrind[=EXE]        Run the "mysqld" server using valgrind, optionally

                        specifying the executable path/name

  valgrind-mysqltest[=EXE] In addition, run the "mysqltest" executable with valgrind

  valgrind-all[=EXE]    Adds verbose flag, and --show-reachable to valgrind

  valgrind-options=ARGS Extra options to give valgrind