bzr commit into mysql-5.1-telco-6.3 branch (pekka:3363) Bug#58277

[Pekka Nousiainen]

#At file:///export/space/pekka/ms/ms-bug58277-63/ based on revid:pekka@stripped

 3363 Pekka Nousiainen	2010-12-05
      bug#58277 a05_fix2.diff
      remove state assert in drop index

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
      storage/ndb/test/ndbapi/testOIBasic.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp	2010-12-02 18:08:13 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp	2010-12-05 13:00:33 +0000
@@ -439,7 +439,11 @@ void
 Dbtux::dropIndex(Signal* signal, IndexPtr indexPtr, Uint32 senderRef, Uint32 senderData)
 {
   jam();
-  ndbrequire(indexPtr.p->m_state == Index::Dropping);
+  /*
+   * Index state should be Defining or Dropping but in 7.0 it can also
+   * be NotDefined (due to double call).  The Index record is always
+   * consistent regardless of state so there is no state assert here.
+   */
   // drop fragments
   while (indexPtr.p->m_numFrags > 0) {
     jam();

=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp	2010-12-03 20:34:46 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp	2010-12-05 13:00:33 +0000
@@ -1050,7 +1050,7 @@ Dbtux::scanCheck(ScanOpPtr scanPtr, Tree
  *
  * Error handling:  If scan error code has been set, return false since
  * no new result can be returned to LQH.  The scan will then look for
- * next result and terminate wia scanCheck():
+ * next result and terminate via scanCheck():
  */
 bool
 Dbtux::scanVisible(ScanOpPtr scanPtr, TreeEnt ent)

=== modified file 'storage/ndb/test/ndbapi/testOIBasic.cpp'
--- a/storage/ndb/test/ndbapi/testOIBasic.cpp	2010-01-18 16:31:48 +0000
+++ b/storage/ndb/test/ndbapi/testOIBasic.cpp	2010-12-05 13:00:33 +0000
@@ -5918,8 +5918,8 @@ main(int argc,  char** argv)
       g_opt.m_noverify = true;
       continue;
     }
-    if (strcmp(arg, "-pctmrr") ==0 ) {
-      if (++argc, --argc > 0) {
+    if (strcmp(arg, "-pctmrr") == 0) {
+      if (++argv, --argc > 0) {
         g_opt.m_pctmrr = atoi(argv[0]);
         continue;
       }


Attachment: [text/bzr-bundle] bzr/[e-mail]