bk commit into 5.1 tree (tomas:1.1822)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.1822 05/05/05 17:03:32 tomas@stripped +3 -0
  updated async gen and corresponding mysql test to use varbinary

  storage/ndb/test/ndbapi/bench/ndb_schema.hpp
    1.3 05/05/05 17:03:18 tomas@stripped +1 -1
    updated async gen and corresponding mysql test to use varbinary

  storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
    1.3 05/05/05 17:03:18 tomas@stripped +4 -5
    updated async gen and corresponding mysql test to use varbinary

  mysql-test/t/rpl_ndb_load.test
    1.2 05/05/05 17:03:17 tomas@stripped +1 -1
    updated async gen and corresponding mysql test to use varbinary

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-opt

--- 1.2/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp	2005-04-08 02:44:25 +02:00
+++ 1.3/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp	2005-05-05 17:03:18 +02:00
@@ -325,11 +325,10 @@
   td->transactionData.do_rollback = 
     getNextRandom(&td->generator.rollbackSequenceT4);
 
-#if 0
-  memset(td->transactionData.session_details, 
-	 myRandom48(26)+'A', SESSION_DETAILS_LENGTH);
-#endif
-  td->transactionData.session_details[SESSION_DETAILS_LENGTH] = 0;
+  memset(td->transactionData.session_details+2, 
+	 myRandom48(26)+'A', SESSION_DETAILS_LENGTH-3);
+  td->transactionData.session_details[SESSION_DETAILS_LENGTH-1] = 0;
+  int2store(td->transactionData.session_details,SESSION_DETAILS_LENGTH-2);
   
   /*-----------------*/
   /* Run transaction */

--- 1.2/storage/ndb/test/ndbapi/bench/ndb_schema.hpp	2005-04-08 02:44:25 +02:00
+++ 1.3/storage/ndb/test/ndbapi/bench/ndb_schema.hpp	2005-05-05 17:03:18 +02:00
@@ -36,7 +36,7 @@
 #define SERVER_INSERTS           "NO_OF_INSERT"
 #define SERVER_DELETES           "NO_OF_DELETE"
 
-#define GROUP_TABLE              "GROUP"
+#define GROUP_TABLE              "GROUP_T"
 #define GROUP_ID                 "GROUP_ID"
 #define GROUP_NAME               "GROUP_NAME"
 #define GROUP_ALLOW_READ         "ALLOW_READ"

--- 1.1/mysql-test/t/rpl_ndb_load.test	2005-05-04 15:26:23 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_load.test	2005-05-05 17:03:17 +02:00
@@ -45,7 +45,7 @@
 CREATE TABLE SESSION
                 ( NUMBER    CHAR(12)   BINARY NOT NULL,
                   SERVER_ID INT UNSIGNED NOT NULL,
-                  DATA      BINARY(2000) NOT NULL,
+                  DATA      VARBINARY(1998) NOT NULL,
                   PRIMARY KEY USING HASH (NUMBER,SERVER_ID))
    ENGINE = NDB;