Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

mysql-test/r/ndbapi.result

 DROP TABLE IF EXISTS t0;
 drop database if exists mysqltest;
-Running ndbapi_simple, results in /windows/Linux_space/MySQL/mysql-5.1/mysql-test/var/log/ndb_testrun.log
-Running ndbapi_simple_index, results in /windows/Linux_space/MySQL/mysql-5.1/mysql-test/var/log/ndb_testrun.log
-Running ndbapi_scan, results in /windows/Linux_space/MySQL/mysql-5.1/mysql-test/var/log/ndb_testrun.log
-Running ndbapi_retries, results in /windows/Linux_space/MySQL/mysql-5.1/mysql-test/var/log/ndb_testrun.log
-Running ndbapi_async, results in /windows/Linux_space/MySQL/mysql-5.1/mysql-test/var/log/ndb_testrun.log
-Running ndbapi_async1, results in /windows/Linux_space/MySQL/mysql-5.1/mysql-test/var/log/ndb_testrun.log
+Running ndbapi_simple
+Running ndbapi_simple_index
+Running ndbapi_scan
+Running ndbapi_retries
+Running ndbapi_async
+Running ndbapi_async1
 use TEST_DB;
 create table t0(c0 int, c1 int, c2 char(4), c3 char(4), c4 text,
 primary key(c0, c2)) engine ndb charset latin1;
@@ -19,4 +19,4 @@ update t0 set c2 = 'G' where c0 = 1;
 update t0 set c0 = 5, c2 = 'H' where c0 = 3;
 delete from t0;
 drop table t0;
-Running mgmapi_logevent, results in /windows/Linux_space/MySQL/mysql-5.1/mysql-test/var/log/ndb_testrun.log
+Running mgmapi_logevent

mysql-test/r/rpl_ndbapi_multi.result

@@ -4,4 +4,5 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-Running mgmapi_logevent, results in /windows/Linux_space/MySQL/mysql-5.1/mysql-test/var/log/ndb_testrun.log
+Running ndbapi_simple_dual
+Running mgmapi_logevent

mysql-test/t/ndbapi.test

@@ -6,28 +6,28 @@ DROP TABLE IF EXISTS t0;
 drop database if exists mysqltest;
 --enable_warnings
 
---exec echo Running ndbapi_simple, results in $NDB_EXAMPLES_OUTPUT
+--exec echo Running ndbapi_simple
 --exec $NDB_EXAMPLES_DIR/ndbapi_simple/ndbapi_simple $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT
 
---exec echo Running ndbapi_simple_index, results in $NDB_EXAMPLES_OUTPUT
+--exec echo Running ndbapi_simple_index
 --exec $NDB_EXAMPLES_DIR/ndbapi_simple_index/ndbapi_simple_index $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT
 
---exec echo Running ndbapi_scan, results in $NDB_EXAMPLES_OUTPUT
+--exec echo Running ndbapi_scan
 --exec $NDB_EXAMPLES_DIR/ndbapi_scan/ndbapi_scan $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT
 
---exec echo Running ndbapi_retries, results in $NDB_EXAMPLES_OUTPUT
+--exec echo Running ndbapi_retries
 --exec $NDB_EXAMPLES_DIR/ndbapi_retries/ndbapi_retries $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT
 
---exec echo Running ndbapi_async, results in $NDB_EXAMPLES_OUTPUT
+--exec echo Running ndbapi_async
 --exec $NDB_EXAMPLES_DIR/ndbapi_async/ndbapi_async $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT
 
---exec echo Running ndbapi_async1, results in $NDB_EXAMPLES_OUTPUT
+--exec echo Running ndbapi_async1
 --exec $NDB_EXAMPLES_DIR/ndbapi_async1/ndbapi_async1 $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT
 
 use TEST_DB;
 create table t0(c0 int, c1 int, c2 char(4), c3 char(4), c4 text,
                 primary key(c0, c2)) engine ndb charset latin1;
-#--exec echo Running ndbapi_event, results in $NDB_EXAMPLES_OUTPUT
+#--exec echo Running ndbapi_event
 #--exec $NDB_EXAMPLES_DIR/ndbapi_event/ndbapi_event "localhost:$NDBCLUSTER_PORT" 1 >> $NDB_EXAMPLES_OUTPUT
 insert into t0 values (1, 2, 'a', 'b', null);
 insert into t0 values (3, 4, 'c', 'd', null);
@@ -40,5 +40,5 @@ update t0 set c0 = 5, c2 = 'H' where c0 = 3; -- update full PK
 delete from t0;
 drop table t0;
 
---exec echo Running mgmapi_logevent, results in $NDB_EXAMPLES_OUTPUT
+--exec echo Running mgmapi_logevent
 --exec $NDB_EXAMPLES_DIR/mgmapi_logevent/mgmapi_logevent "localhost:$NDBCLUSTER_PORT" 1 >> $NDB_EXAMPLES_OUTPUT

mysql-test/t/rpl_ndbapi_multi.test

@@ -3,8 +3,9 @@
 -- source include/master-slave.inc
 -- source include/have_ndbapi_examples.inc
 
+--exec echo Running ndbapi_simple_dual
 --exec $NDB_EXAMPLES_DIR/ndbapi_simple_dual/ndbapi_simple_dual $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" $SLAVE_MYSOCK "localhost:$NDBCLUSTER_PORT_SLAVE" >> $NDB_EXAMPLES_OUTPUT
 
---exec echo Running mgmapi_logevent, results in $NDB_EXAMPLES_OUTPUT
+--exec echo Running mgmapi_logevent
 --exec $NDB_EXAMPLES_DIR/mgmapi_logevent/mgmapi_logevent "localhost:$NDBCLUSTER_PORT" "localhost:$NDBCLUSTER_PORT_SLAVE" 1 >> $NDB_EXAMPLES_OUTPUT