bk commit into 5.1 tree (jonas:1.2079)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-31 14:25:16+01:00, jonas@stripped +4 -0
  ndb - fix some ndb_* test

  mysql-test/r/ndb_multi.result@stripped, 2006-10-31 14:25:14+01:00, jonas@stripped +0 -6
    make test more predicatable

  mysql-test/t/ndb_multi.test@stripped, 2006-10-31 14:25:15+01:00, jonas@stripped +0 -1
    make test more predicatable

  mysql-test/t/ndb_partition_key.test@stripped, 2006-10-31 14:25:15+01:00, jonas@stripped +1 -1
    make test more predicatable

  storage/ndb/src/common/transporter/TCP_Transporter.cpp@stripped, 2006-10-31 14:25:15+01:00, jonas@stripped +4 -4
    make test more predicatable

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-wl2325-5.0-drop6

--- 1.12/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2006-10-31 14:25:19 +01:00
+++ 1.13/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2006-10-31 14:25:19 +01:00
@@ -176,8 +176,8 @@
   if (setsockopt(fd, level, optval,
 		 (char*)&val, sizeof(val)) < 0)
   {
-    ndbout_c("setsockopt(%s, %d) errno: %d %s", 
-	     optname, val, errno, strerror(errno));
+    fprintf(stderr, "setsockopt(%s, %d) errno: %d %s\n", 
+	    optname, val, errno, strerror(errno));
   }
   
   len = sizeof(actual);
@@ -185,8 +185,8 @@
 		  (char*)&actual, &len) == 0) &&
       actual != val)
   {
-    ndbout_c("setsockopt(%s, %d) - actual %d default: %d", 
-	     optname, val, actual, defval);
+    fprintf(stderr, "setsockopt(%s, %d) - actual %d default: %d\n", 
+	    optname, val, actual, defval);
   }
 }
 

--- 1.5/mysql-test/t/ndb_partition_key.test	2006-10-31 14:25:19 +01:00
+++ 1.6/mysql-test/t/ndb_partition_key.test	2006-10-31 14:25:19 +01:00
@@ -53,7 +53,7 @@
 insert into t1 values (1,"a",1,1),(2,"a",1,1),(3,"a",1,1);
 
 # should show only one attribute with DISTRIBUTION KEY
---exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d test t1 | sed 's/Version: [0-9]*//' | sed 's/\(Length of frm data: \)[0-9]*/\1#/'
+--exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d test t1 2>/dev/null | sed 's/Version: [0-9]*//' | sed 's/\(Length of frm data: \)[0-9]*/\1#/'
 
 #
 # Test that explicit partition info is not shown in show create table

--- 1.8/mysql-test/r/ndb_multi.result	2006-10-31 14:25:19 +01:00
+++ 1.9/mysql-test/r/ndb_multi.result	2006-10-31 14:25:19 +01:00
@@ -31,12 +31,6 @@
 insert into t1 value (2);
 select * from t1;
 ERROR HY000: Table definition has changed, please retry transaction
-show warnings;
-Level	Code	Message
-Error	1296	Got error 241 'Invalid schema object version' from NDB
-Error	1296	Got error 241 'Invalid schema object version' from NDB
-Error	1412	Table definition has changed, please retry transaction
-Error	1105	Unknown error
 select * from t1;
 a
 2

--- 1.8/mysql-test/t/ndb_multi.test	2006-10-31 14:25:19 +01:00
+++ 1.9/mysql-test/t/ndb_multi.test	2006-10-31 14:25:19 +01:00
@@ -43,7 +43,6 @@
 # Currently a retry is required remotely
 --error 1412
 select * from t1;
-show warnings;
 select * from t1;
 
 # Connect to server2 and use the tables from there