Commit 1425684e authored by unknown's avatar unknown
Browse files

ndb - minor style fixes 

  


storage/ndb/src/ndbapi/Ndb.cpp:
  Fix usage of correct types internally to ndbapi
storage/ndb/test/ndbapi/testBlobs.cpp:
  minor fixes to testBlobs
parent 80db1a21

storage/ndb/src/ndbapi/Ndb.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ Ndb::opTupleIdOnNdb(const NdbTableImpl* table, 
      tOperation->incValue("NEXTID", opValue);

      tRecAttrResult = tOperation->getValue("NEXTID");



      if (tConnection->execute( Commit ) == -1 )

      if (tConnection->execute( NdbTransaction::Commit ) == -1 )

        goto error_handler;



      tValue = tRecAttrResult->u_64_value();
@@ -1093,7 +1093,7 @@ Ndb::opTupleIdOnNdb(const NdbTableImpl* table, 
      tOperation->equal("SYSKEY_0", aTableId );

      tOperation->setValue("NEXTID", opValue);



      if (tConnection->execute( Commit ) == -1 )

      if (tConnection->execute( NdbTransaction::Commit ) == -1 )

        goto error_handler;



      range.reset();
@@ -1110,7 +1110,7 @@ Ndb::opTupleIdOnNdb(const NdbTableImpl* table, 
      tOperation->def_label(0);

      tOperation->interpret_exit_nok(9999);

      

      if (tConnection->execute( Commit ) == -1)

      if (tConnection->execute( NdbTransaction::Commit ) == -1)

      {

        if (tConnection->theError.code != 9999)

          goto error_handler;
@@ -1127,7 +1127,7 @@ Ndb::opTupleIdOnNdb(const NdbTableImpl* table, 
      tOperation->readTuple();

      tOperation->equal("SYSKEY_0", aTableId );

      tRecAttrResult = tOperation->getValue("NEXTID");

      if (tConnection->execute( Commit ) == -1 )

      if (tConnection->execute( NdbTransaction::Commit ) == -1 )

        goto error_handler;

      opValue = tRecAttrResult->u_64_value(); // out

      break;

storage/ndb/test/ndbapi/testBlobs.cpp

+4 −3
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ verifyHeadInline(const Tup& tup) 
  if (! g_opt.m_oneblob)

    CHK((ra2 = g_opr->getValue("BL2")) != 0);

  if (tup.m_exists) {

    CHK(g_con->execute(Commit) == 0);

    CHK(g_con->execute(Commit, AbortOnError) == 0);

    DBG("verifyHeadInline BL1");

    CHK(verifyHeadInline(g_opt.m_blob1, tup.m_blob1, ra1) == 0);

    if (! g_opt.m_oneblob) {
@@ -743,7 +743,8 @@ verifyHeadInline(const Tup& tup) 
      CHK(verifyHeadInline(g_opt.m_blob2, tup.m_blob2, ra2) == 0);

    }

  } else {

    CHK(g_con->execute(Commit) == -1 && g_con->getNdbError().code == 626);

    CHK(g_con->execute(Commit, AbortOnError) == -1 && 

	g_con->getNdbError().code == 626);

  }

  g_ndb->closeTransaction(g_con);

  g_opr = 0;
@@ -1535,7 +1536,7 @@ testperf() 
  g_dic = g_ndb->getDictionary();

  NdbDictionary::Table tab(g_opt.m_tnameperf);

  if (g_dic->getTable(tab.getName()) != 0)

    CHK(g_dic->dropTable(tab) == 0);

    CHK(g_dic->dropTable(tab.getName()) == 0);

  // col A - pk

  { NdbDictionary::Column col("A");

    col.setType(NdbDictionary::Column::Unsigned);