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

[Jonas Oreland]

 4558 Jonas Oreland	2011-09-28
      ndb - fix windows compiler warnings

    modified:
      storage/ndb/src/common/portlib/NdbCondition.c
      storage/ndb/test/ndbapi/testRestartGci.cpp
      storage/ndb/test/ndbapi/test_event.cpp
 4557 Jonas Oreland	2011-09-28
      ndb - fix incorrect argument

    modified:
      storage/ndb/test/tools/hugoJoin.cpp
 4556 Jonas Oreland	2011-09-28
      ndb - enable frazers new tests also in 7.0...(i'd be disappointed if windows doesn't get red now)

    modified:
      mysql-test/suite/ndb_binlog/t/ndb_binlog_log_transaction_id-master.opt
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf
=== modified file 'storage/ndb/src/common/portlib/NdbCondition.c'
--- a/storage/ndb/src/common/portlib/NdbCondition.c	2011-09-27 17:28:13 +0000
+++ b/storage/ndb/src/common/portlib/NdbCondition.c	2011-09-28 10:04:03 +0000
@@ -191,17 +191,23 @@ NdbCondition_WaitTimeoutAbs(struct NdbCo
                             const struct timespec * abstime)
 {
 #ifdef NDB_WIN
+  /**
+   * mysys windows wrapper of pthread_cond_timedwait
+   *   does not have a const argument for the timespec
+   */
   struct timespec tmp = *abstime;
-  abstime = &tmp;
+  struct timespec * waitarg = &tmp;
+#else
+  const struct timespec * waitarg = abstime;
 #endif
 
   if (p_cond == NULL || p_mutex == NULL)
     return 1;
 
 #ifdef NDB_MUTEX_STRUCT
-  return pthread_cond_timedwait(&p_cond->cond, &p_mutex->mutex, abstime);
+  return pthread_cond_timedwait(&p_cond->cond, &p_mutex->mutex, waitarg);
 #else
-  return pthread_cond_timedwait(&p_cond->cond, p_mutex, abstime);
+  return pthread_cond_timedwait(&p_cond->cond, p_mutex, waitarg);
 #endif
 }
 

=== modified file 'storage/ndb/test/ndbapi/testRestartGci.cpp'
--- a/storage/ndb/test/ndbapi/testRestartGci.cpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/ndbapi/testRestartGci.cpp	2011-09-28 10:04:03 +0000
@@ -546,7 +546,7 @@ int runUpdateVerifyGCI(NDBT_Context* ctx
     CHECK(rowGci != NULL);
 
     /* Define an update op to set the next GCI */
-    CHECK(hugoOps.pkUpdateRecord(pNdb, 0, 1, loopCount+1) == 0);
+    CHECK(hugoOps.pkUpdateRecord(pNdb, 0, 1, (int)(loopCount+1)) == 0);
 
     if (hugoOps.execute_Commit(pNdb) != 0)
     {

=== modified file 'storage/ndb/test/ndbapi/test_event.cpp'
--- a/storage/ndb/test/ndbapi/test_event.cpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/ndbapi/test_event.cpp	2011-09-28 10:04:03 +0000
@@ -168,7 +168,7 @@ Uint32 setAnyValue(Ndb* ndb, NdbTransact
 {
   /* XOR 2 32bit words of transid together */
   Uint64 transId = trans->getTransactionId();
-  return transId ^ (transId >> 32);
+  return (Uint32)(transId ^ (transId >> 32));
 }
 
 bool checkAnyValueTransId(Uint64 transId, Uint32 anyValue)

=== modified file 'storage/ndb/test/tools/hugoJoin.cpp'
--- a/storage/ndb/test/tools/hugoJoin.cpp	2011-04-06 14:16:13 +0000
+++ b/storage/ndb/test/tools/hugoJoin.cpp	2011-09-28 09:54:05 +0000
@@ -192,7 +192,7 @@ int main(int argc, char** argv){
     }
     HugoQueryBuilder builder(&MyNdb, tables.getBase(), mask);
     builder.setJoinLevel(_depth);
-    const NdbQueryDef * q = builder.createQuery(&MyNdb);
+    const NdbQueryDef * q = builder.createQuery();
     if (_verbose >= 2)
     {
       q->print(); ndbout << endl;

No bundle (reason: useless for push emails).