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

[Pekka Nousiainen]

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

 3374 Pekka Nousiainen	2011-01-03
      bug#58277,bug#57057 a07_fix4.diff
      ifdef on ERROR_INSERT, add to daily-basic-tests

    modified:
      storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
      storage/ndb/test/ndbapi/testDict.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp	2011-01-03 10:56:37 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp	2011-01-03 11:02:42 +0000
@@ -54,19 +54,25 @@ void Dbtup::execSTORED_PROCREQ(Signal* s
   switch (requestInfo) {
   case ZSCAN_PROCEDURE:
     jam();
+#if defined VM_TRACE || defined ERROR_INSERT
     storedProcCountNonAPI(apiBlockref, +1);
+#endif
     scanProcedure(signal,
                   regOperPtr.p,
                   signal->theData[4]);
     break;
   case ZCOPY_PROCEDURE:
     jam();
+#if defined VM_TRACE || defined ERROR_INSERT
     storedProcCountNonAPI(apiBlockref, +1);
+#endif
     copyProcedure(signal, regTabPtr, regOperPtr.p);
     break;
   case ZSTORED_PROCEDURE_DELETE:
     jam();
+#if defined VM_TRACE || defined ERROR_INSERT
     storedProcCountNonAPI(apiBlockref, -1);
+#endif
     deleteScanProcedure(signal, regOperPtr.p);
     break;
   default:

=== modified file 'storage/ndb/test/ndbapi/testDict.cpp'
--- a/storage/ndb/test/ndbapi/testDict.cpp	2011-01-03 10:56:37 +0000
+++ b/storage/ndb/test/ndbapi/testDict.cpp	2011-01-03 11:02:42 +0000
@@ -4104,6 +4104,7 @@ runBug58277createtable(NDBT_Context* ctx
 
   do
   {
+    CHK2(rows > 0, "cannot use --records=0"); // others require this
     g_info << "create table " << tabname << endl;
     NdbDictionary::Table tab(tabname);
     const char* name[] = { "a", "b" };

=== modified file 'storage/ndb/test/run-test/daily-basic-tests.txt'
--- a/storage/ndb/test/run-test/daily-basic-tests.txt	2010-12-02 18:10:25 +0000
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt	2011-01-03 11:02:42 +0000
@@ -1499,3 +1499,7 @@ max-time: 300
 cmd: testDict
 args: -n Bug58277 T1
 
+max-time: 300
+cmd: testDict
+args: -n Bug57057 T1
+


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