bk commit into 5.1 tree (tomas:1.2352)

[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.2352 06/04/21 17:28:45 tomas@stripped +2 -0
  disabled.def cleanup

  storage/ndb/test/ndbapi/bank/Bank.cpp
    1.16 06/04/21 17:28:35 tomas@stripped +2 -1
    added skip create option to bank test program

  mysql-test/t/disabled.def
    1.141 06/04/21 17:28:35 tomas@stripped +2 -15
    disabled.def cleanup

# 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-new

--- 1.140/mysql-test/t/disabled.def	2006-04-21 01:59:16 +02:00
+++ 1.141/mysql-test/t/disabled.def	2006-04-21 17:28:35 +02:00
@@ -24,13 +24,12 @@
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_2myisam          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_auto_inc         : BUG#17086 2006-02-16 jmiller CR: auto_increment_increment and
auto_increment_offset produce duplicate key er
-rpl_ndb_ddl              : result file needs update + test needs to checked
+rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on solaris
+rpl_ndb_ddl              : BUG#18946 result file needs update + test needs to checked
 rpl_ndb_innodb2ndb       : BUG#17400 2006-04-19 tomas Cluster Replication: delete &
update of rows in table without pk fails on slave.
 rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create
table and insert (on different table) not determ
 rpl_ndb_myisam2ndb       : BUG#17400 2006-04-19 tomas Cluster Replication: delete &
update of rows in table without pk fails on slave.
-#rpl_ndb_relay_space      : BUG#16993 2006-02-16 jmiller RBR: ALTER TABLE ZEROFILL
AUTO_INCREMENT is not replicated correctly
 rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian
-#rpl_row_basic_7ndb       : BUG#17400 2006-04-09 brian   Cluster Replication: delete
& update of rows in table without pk fails on slave.
 rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 rpl_row_func003		 : BUG#19074 2006-13-04 andrei  test failed
 rpl_row_inexist_tbl      : BUG#18948 2006-03-09 mats    Disabled since patch makes this
test wait forever
@@ -42,15 +41,3 @@
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug
open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second
binlog may miss schema log events
-
-# the below ndb failures have not been objerved for > 5 push builds, close bugs
-#ndb_gis                  : BUG#18600 2006-03-28 brian ndb_gis test failure
-#ndb_load                 : BUG#17233 2006-02-16 jmiller failed load data from infile
causes mysqld dbug_assert, binlog not flushed
-#rpl_ndb_basic            : BUG#18592 2006-03-28 brian rpl_ndb_basic failure
-#rpl_ndb_dd_advance       : BUG#18924 2006-04-09 brian rpl_ndb_dd_advance failure
-rpl_ndb_dd_partitions     : fails on solaris
-#rpl_ndb_dd_basic         : BUG#18569 2006-03-28 brian rpl_ndb_dd_basic failure
-#rpl_ndb_insert_ignore    : BUG#18567 2006-03-28 brian rpl_ndb_insert_ignore failure
-#rpl_ndb_multi_update2    : BUG#18928 2006-04-09 brian   rpl_ndb_multi_update2 failed
-#rpl_ndb_multi_update3    : BUG#18627 2006-03-29 monty   Cluster Replication:
rpl_ndb_multi_update3 fails on Intel 64 bit
-#rpl_ndb_trig004          : BUG#18977 2006-04-10 kent    Test fails randomly

--- 1.15/storage/ndb/test/ndbapi/bank/Bank.cpp	2006-03-04 08:26:21 +01:00
+++ 1.16/storage/ndb/test/ndbapi/bank/Bank.cpp	2006-04-21 17:28:35 +02:00
@@ -22,7 +22,8 @@
 Bank::Bank(Ndb_cluster_connection& con, bool _init, const char * dbase):
   m_ndb(&con, dbase),
   m_maxAccount(-1),
-  m_initialized(false)
+  m_initialized(false),
+  m_skip_create(false)
 {
   if(_init)
     init();