Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl

@@ -284,7 +284,7 @@ our $opt_start_from;
 
 our $opt_strace_client;
 
-our $opt_timer;
+our $opt_timer= 1;
 
 our $opt_user;
 our $opt_user_test;
@@ -682,7 +682,7 @@ sub command_line_setup () {
              'socket=s'                 => \$opt_socket,
              'start-dirty'              => \$opt_start_dirty,
              'start-and-exit'           => \$opt_start_and_exit,
-             'timer'                    => \$opt_timer,
+             'timer!'                   => \$opt_timer,
              'unified-diff|udiff'       => \$opt_udiff,
              'user-test=s'              => \$opt_user_test,
              'user=s'                   => \$opt_user,
@@ -3603,15 +3603,17 @@ Options to control what engine/variation to run
   compress              Use the compressed protocol between client and server
   ssl                   Use ssl protocol between client and server
   skip-ssl              Dont start server with support for ssl connections
-  bench                 Run the benchmark suite FIXME
-  small-bench           FIXME
+  bench                 Run the benchmark suite
+  small-bench           Run the benchmarks with --small-tests --small-tables
 
 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.
+  benchdir=DIR          The directory where the benchmark suite is stored
+                        (default: ../../mysql-bench)
   tmpdir=DIR            The directory where temporary files are stored
                         (default: ./var/tmp).
+  vardir=DIR            The directory where files generated from the test run
+                        is stored (default: ./var). Specifying a ramdisk or
+                        tmpfs will speed up tests.
 
 Options to control what test suites or cases to run
 
@@ -3626,8 +3628,9 @@ Options to control what test suites or cases to run
   skip-rpl              Skip the replication test cases.
   skip-im               Don't start IM, and skip the IM test cases
   skip-test=PREFIX      Skip test cases which name are prefixed with PREFIX
-  big-test              Pass "--big-test" to mysqltest which will set the environment
-                        variable BIG_TEST, which can be checked from test cases.
+  big-test              Pass "--big-test" to mysqltest which will set the
+                        environment variable BIG_TEST, which can be checked
+                        from test cases.
 
 Options that specify ports
 
@@ -3653,25 +3656,29 @@ Options to run test on running server
 
 Options for debugging the product
 
-  gdb                   Start the mysqld(s) in gdb
-  manual-gdb            Let user manually start mysqld in gdb, before running test(s)
-  manual-debug          Let user manually start mysqld in debugger, before running test(s)
+  client-ddd            Start mysqltest client in ddd
+  client-debugger=NAME  Start mysqltest in the selected debugger
   client-gdb            Start mysqltest client in gdb
   ddd                   Start mysqld in ddd
-  client-ddd            Start mysqltest client in ddd
+  debug                 Dump trace output for all servers and client programs
   debugger=NAME         Start mysqld in the selected debugger
-  client-debugger=NAME  Start mysqltest in the selected debugger
-  strace-client         FIXME
+  gdb                   Start the mysqld(s) in gdb
+  manual-debug          Let user manually start mysqld in debugger, before
+                        running test(s)
+  manual-gdb            Let user manually start mysqld in gdb, before running
+                        test(s)
   master-binary=PATH    Specify the master "mysqld" to use
   slave-binary=PATH     Specify the slave "mysqld" to use
+  strace-client         Create strace output for mysqltest client
 
 Options for coverage, profiling etc
 
   gcov                  FIXME
   gprof                 FIXME
-  valgrind              Run the "mysqltest" and "mysqld" executables using valgrind
-  valgrind-all          Same as "valgrind" but will also add "verbose" and "--show-reachable"
-                        flags to valgrind
+  valgrind              Run the "mysqltest" and "mysqld" executables using
+                        valgrind
+  valgrind-all          Same as "valgrind" but will also add "verbose" and
+                        "--show-reachable" flags to valgrind
   valgrind-mysqltest    Run the "mysqltest" executable with valgrind
   valgrind-mysqld       Run the "mysqld" executable with valgrind
   valgrind-options=ARGS Extra options to give valgrind
@@ -3680,10 +3687,10 @@ Options for coverage, profiling etc
 Misc options
 
   comment=STR           Write STR to the output
+  notimer               Don't show test case execution time
   script-debug          Debug this script itself
-  timer                 Show test case execution time
-  start-and-exit        Only initiate and start the "mysqld" servers, use the startup
-                        settings for the specified test case if any
+  start-and-exit        Only initiate and start the "mysqld" servers, use
+                        the startup settings for the specified test case if any
   start-dirty           Only start the "mysqld" servers without initiation
   fast                  Don't try to cleanup from earlier runs
   reorder               Reorder tests to get less server restarts
@@ -3698,7 +3705,6 @@ Deprecated options
 
 
 Options not yet described, or that I want to look into more
-  debug                 
   local                 
   local-master          
   netware               

mysql-test/r/rpl_ndb_relay_space.result

-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-SHOW VARIABLES LIKE 'relay_log_space_limit';
-Variable_name	Value
-relay_log_space_limit	0
-CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=NDB;
-INSERT INTO t1 SET name='Andy', age=31;
-INSERT INTO t1 SET name='Jacob', age=2;
-INSERT INTO t1 SET name='Caleb', age=1;
-ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;
-SELECT * FROM t1 ORDER BY id;
-name	age	id
-Andy	31	00000001
-Caleb	1	00000002
-Jacob	2	00000003
-SELECT * FROM t1 ORDER BY id;
-name	age	id
-Andy	31	00000001
-Caleb	1	00000002
-Jacob	2	00000003
-DROP TABLE t1;

mysql-test/t/rpl_ndb_relay_space.test

-###################################
-# Wrapper rpl_sv_relay_space.test #
-# This test has to be wrapped as  #
-# It tests ndb, innodb and MyISAM.#
-# By Wrapping we are saving some  #
-# space and making the test more  #
-# Maintainable by only having one #
-# test file and reusing the code  #
-# In Addition, INNODB has to have #
-# Option files during this test   #
-# to force innodb on the slave    #
-# else the test will fail         #
-###################################
-#Change Author: JBM               #
-#Change Date: 2006-02-03          #
-#Change: Added Comments           # 
-###################################
---source include/have_ndb.inc
-let $engine_type=NDB;
--- source extra/rpl_tests/rpl_sv_relay_space.test
-