diff options
| author | unknown <pekka@mysql.com> | 2004-12-22 15:08:23 +0100 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2004-12-22 15:08:23 +0100 |
| commit | 30d598926846651d16c947ac57d094589accab3c (patch) | |
| tree | f9c90162b14179ea707662acb9c9660d8147a549 /ndb/test/ndbapi/testBlobs.cpp | |
| parent | 7f1d19008f3dc8c770c3a11383a2b21ebeff62b0 (diff) | |
| parent | f20ac5cab0b2af74c739860f4adc00d57243d435 (diff) | |
| download | mariadb-git-30d598926846651d16c947ac57d094589accab3c.tar.gz | |
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
Diffstat (limited to 'ndb/test/ndbapi/testBlobs.cpp')
| -rw-r--r-- | ndb/test/ndbapi/testBlobs.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ndb/test/ndbapi/testBlobs.cpp b/ndb/test/ndbapi/testBlobs.cpp index b2cc5636e45..7b30777456f 100644 --- a/ndb/test/ndbapi/testBlobs.cpp +++ b/ndb/test/ndbapi/testBlobs.cpp @@ -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); } |