bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4569 to 4570)

[jonas oreland]

 4570 jonas oreland	2011-10-04
      ndb - fix spurious crash when dropping tablespace (incorrect gsn in delay)

    modified:
      storage/ndb/src/kernel/blocks/tsman.cpp
 4569 jonas oreland	2011-10-04
      ndb - remove HugoQueryBuilder::O_RANDOM_OPTIONS, (and enumerate values for OM_RANDOM_OPTIONS)

    modified:
      storage/ndb/test/include/HugoQueryBuilder.hpp
=== modified file 'storage/ndb/src/kernel/blocks/tsman.cpp'
--- a/storage/ndb/src/kernel/blocks/tsman.cpp	2011-03-15 16:11:47 +0000
+++ b/storage/ndb/src/kernel/blocks/tsman.cpp	2011-10-04 07:56:40 +0000
@@ -488,7 +488,7 @@ Tsman::execDROP_FILEGROUP_IMPL_REQ(Signa
       if (ptr.p->m_ref_count)
       {
         jam();
-        sendSignalWithDelay(reference(), GSN_DROP_FILEGROUP_REQ, signal,
+        sendSignalWithDelay(reference(), GSN_DROP_FILEGROUP_IMPL_REQ, signal,
                             100, signal->getLength());
         return;
       }

No bundle (reason: useless for push emails).