bk commit into 5.1 tree (tomas:1.1909)

[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.1909 05/09/19 11:07:20 tomas@stripped +3 -0
  corrected ndb repl bank test

  storage/ndb/test/ndbapi/bank/BankLoad.cpp
    1.10 05/09/19 11:07:15 tomas@stripped +1 -1
    corrected ndb repl bank test

  mysql-test/t/rpl_ndb_bank.test
    1.3 05/09/19 11:07:15 tomas@stripped +4 -5
    corrected ndb repl bank test

  mysql-test/r/rpl_ndb_bank.result
    1.2 05/09/19 11:07:14 tomas@stripped +2 -2
    corrected ndb repl bank test

# 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/mysql-5.1-wl2325-5.0

--- 1.9/storage/ndb/test/ndbapi/bank/BankLoad.cpp	2005-04-08 02:44:25 +02:00
+++ 1.10/storage/ndb/test/ndbapi/bank/BankLoad.cpp	2005-09-19 11:07:15 +02:00
@@ -23,7 +23,7 @@
  */
 struct AccountTypesStruct {
   int id;
-  const char* descr;
+  const char descr[64];
 };
 const AccountTypesStruct accountTypes[] = {
   { 0, "KASSA"},

--- 1.1/mysql-test/r/rpl_ndb_bank.result	2005-07-21 20:35:14 +02:00
+++ 1.2/mysql-test/r/rpl_ndb_bank.result	2005-09-19 11:07:14 +02:00
@@ -6,7 +6,7 @@
 start slave;
 CREATE DATABASE IF NOT EXISTS BANK;
 DROP DATABASE BANK;
-CREATE DATABASE BANK;
+CREATE DATABASE BANK default charset=latin1 default collate=latin1_bin;
 USE BANK;
 CREATE TABLE GL ( TIME BIGINT UNSIGNED NOT NULL,
 ACCOUNT_TYPE INT UNSIGNED NOT NULL,
@@ -37,7 +37,7 @@
 VALUE BIGINT UNSIGNED NOT NULL,
 PRIMARY KEY USING HASH (SYSTEM_VALUES_ID))
 ENGINE = NDB;
-CREATE TABLE ACCOUNT_TYPES ( ACCOUNT_TYPE_ID INT UNSIGNED NOT NULL,
+CREATE TABLE ACCOUNT_TYPE ( ACCOUNT_TYPE_ID INT UNSIGNED NOT NULL,
 DESCRIPTION CHAR(64) NOT NULL,
 PRIMARY KEY USING HASH (ACCOUNT_TYPE_ID))
 ENGINE = NDB;

--- 1.2/mysql-test/t/rpl_ndb_bank.test	2005-08-22 10:30:12 +02:00
+++ 1.3/mysql-test/t/rpl_ndb_bank.test	2005-09-19 11:07:15 +02:00
@@ -23,7 +23,7 @@
 --connection master
 CREATE DATABASE IF NOT EXISTS BANK;
 DROP DATABASE BANK;
-CREATE DATABASE BANK;
+CREATE DATABASE BANK default charset=latin1 default collate=latin1_bin;
 --enable_warnings
 
 #
@@ -70,7 +70,6 @@
                             PRIMARY KEY USING HASH (ACCOUNT_TYPE_ID))
    ENGINE = NDB;
 
-
 #
 # create "BANK" application
 #
@@ -96,7 +95,7 @@
 #
 # let the "BANK" run for a while
 #
---sleep 5;
+--sleep 5
 
 --disable_warnings
 # initialize slave for sync
@@ -192,13 +191,13 @@
 # 1. dump database BANK on both master and slave
 # 2. compare, there should be no difference
 #
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info BANK > master_BANK.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info BANK ACCOUNT_TYPE ACCOUNT GL TRANSACTION > master_BANK.sql
 --connection master
 use test;
 create table t1 (a int primary key) engine=ndb;
 insert into t1 values (1);
 --sync_slave_with_master
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info BANK > slave_BANK.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info BANK ACCOUNT_TYPE ACCOUNT GL TRANSACTION > slave_BANK.sql
 --connection master
 drop table t1;