bk commit into 5.1 tree (tomas:1.2202)

[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.2202 06/03/22 15:56:53 tomas@stripped +2 -0
  continued:
  ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour

  mysql-test/t/disabled.def
    1.106 06/03/22 15:56:42 tomas@stripped +2 -2
    continued:
    ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour

  include/my_base.h
    1.86 06/03/22 15:56:42 tomas@stripped +2 -0
    continued:
    ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour

# 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.85/include/my_base.h	2006-03-10 17:52:21 +01:00
+++ 1.86/include/my_base.h	2006-03-22 15:56:42 +01:00
@@ -159,6 +159,8 @@
     Ignore if the a tuple is not found, continue processing the
     transaction and ignore that 'row'.  Needed for idempotency
     handling on the slave
+
+    Currently only used by NDB storage engine. Partition handler ignores flag.
   */
   HA_EXTRA_IGNORE_NO_KEY,
   HA_EXTRA_NO_IGNORE_NO_KEY,

--- 1.105/mysql-test/t/disabled.def	2006-03-21 12:33:07 +01:00
+++ 1.106/mysql-test/t/disabled.def	2006-03-22 15:56:42 +01:00
@@ -23,8 +23,8 @@
 ps_7ndb                 : dbug assert in RBR mode when executing test suite
 #rpl_bit_npk             : Bug#13418
 rpl_ddl                 : Bug#15963 SBR does not show "Definer" correctly
-rpl_ndb_2innodb         : Assert failure in ha_partition::extra()
-rpl_ndb_2myisam         : Assert failure in ha_partition::extra()
+rpl_ndb_2innodb         : If removed fails later on assertion in get_parts_for_update()
+rpl_ndb_2myisam         : If removed fails later on assertion in get_parts_for_update()
 rpl_ndb_auto_inc        : Bug#17086
 #rpl_ndb_basic           : Bug#16228 [IN REVIEW]
 rpl_ndb_blob            : interferes with following tests, causing hang