Commit 0c46f1e7 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
client/mysqltest.c:
  Manual merge, will add ramils patch afterwards
parents a50bc797 f814e19d

client/mysqltest.c

+763 −663

File changed.

Preview size limit exceeded, changes collapsed.

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

+25 −0
Original line number Diff line number Diff line
@@ -192,6 +192,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;
@@ -494,6 +497,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,
@@ -2570,6 +2576,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, ....
@@ -2701,6 +2722,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

mysql-test/r/mysqltest.result

+3 −0
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ hello 
mysqltest: At line 1: End of line junk detected: "6"

mysqltest: At line 1: End of line junk detected: "6"

mysqltest: At line 1: Missing delimiter

mysqltest: End of line junk detected: "sleep 7

# Another comment

"

mysqltest: At line 1: Extra delimiter ";" found

mysqltest: At line 1: Extra delimiter ";" found

MySQL