Commit 30d59892 authored by unknown's avatar unknown
Browse files

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/space/pekka/ndb/version/my41
parents 7f1d1900 f20ac5ca

ndb/test/ndbapi/testBlobs.cpp

+7 −3
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ testcase(char x) 
    (g_opt.m_skip == 0 || strchr(g_opt.m_skip, x) == 0);

}



static Ndb_cluster_connection* g_ncc = 0;

static Ndb* g_ndb = 0;

static NdbDictionary::Dictionary* g_dic = 0;

static NdbConnection* g_con = 0;
@@ -1259,7 +1260,7 @@ deleteScan(bool idx) 
static int

testmain()

{

  g_ndb = new Ndb("TEST_DB");

  g_ndb = new Ndb(g_ncc, "TEST_DB");

  CHK(g_ndb->init() == 0);

  CHK(g_ndb->waitUntilReady() == 0);

  g_dic = g_ndb->getDictionary();
@@ -1448,7 +1449,7 @@ testperf() 
  if (! testcase('p'))

    return 0;

  DBG("=== perf test ===");

  g_ndb = new Ndb("TEST_DB");

  g_ndb = new Ndb(g_ncc, "TEST_DB");

  CHK(g_ndb->init() == 0);

  CHK(g_ndb->waitUntilReady() == 0);

  g_dic = g_ndb->getDictionary();
@@ -1860,10 +1861,13 @@ NDB_COMMAND(testOdbcDriver, "testBlobs", "testBlobs", "testBlobs", 65535) 
    strcat(b, "r");

    g_opt.m_skip = strdup(b);

  }

  if (testmain() == -1 || testperf() == -1) {

  g_ncc = new Ndb_cluster_connection();

  if (g_ncc->connect(30) != 0 || testmain() == -1 || testperf() == -1) {

    ndbout << "line " << __LINE__ << " FAIL loop=" << g_loop << endl;

    return NDBT_ProgramExit(NDBT_FAILED);

  }

  delete g_ncc;

  g_ncc = 0;

  return NDBT_ProgramExit(NDBT_OK);

}

ndb/test/ndbapi/testOIBasic.cpp

+8 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct Opt { 
  unsigned m_subloop;

  const char* m_table;

  unsigned m_threads;

  unsigned m_v;

  int m_v;

  Opt() :

    m_batch(32),

    m_bound("01234"),
@@ -672,6 +672,8 @@ tabcount = sizeof(tablist) / sizeof(tablist[0]); 


// connections



static Ndb_cluster_connection* g_ncc = 0;



struct Con {

  Ndb* m_ndb;

  NdbDictionary::Dictionary* m_dic;
@@ -720,7 +722,7 @@ int 
Con::connect()

{

  assert(m_ndb == 0);

  m_ndb = new Ndb("TEST_DB");

  m_ndb = new Ndb(g_ncc, "TEST_DB");

  CHKCON(m_ndb->init() == 0, *this);

  CHKCON(m_ndb->waitUntilReady(30) == 0, *this);

  m_tx = 0, m_op = 0;
@@ -3514,8 +3516,11 @@ NDB_COMMAND(testOIBasic, "testOIBasic", "testOIBasic", "testOIBasic", 65535) 
  }

  {

    Par par(g_opt);

    if (runtest(par) < 0)

    g_ncc = new Ndb_cluster_connection();

    if (g_ncc->connect(30) != 0 || runtest(par) < 0)

      goto failed;

    delete g_ncc;

    g_ncc = 0;

  }

  // always exit with NDBT code

ok: