From: Pekka Nousiainen Date: June 14 2011 10:42am Subject: bzr commit into mysql-5.1-telco-7.0-wl4124-new0 branch (pekka.nousiainen:4397) WL#4124 List-Archive: http://lists.mysql.com/commits/139191 Message-Id: <20110614104210.898525586E@sama.localdomain> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1968454610==" --===============1968454610== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/space/pekka/ms/ms-wl4124-70/ based on revid:pekka.nousiainen@stripped 4397 Pekka Nousiainen 2011-06-14 wl#4124 x07_fix.diff build fixes modified: storage/ndb/src/ndbapi/CMakeLists.txt storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp storage/ndb/tools/CMakeLists.txt storage/ndb/tools/ndb_dump_frm_data.cpp storage/ndb/tools/ndb_index_stat.cpp === modified file 'storage/ndb/src/ndbapi/CMakeLists.txt' --- a/storage/ndb/src/ndbapi/CMakeLists.txt 2011-06-06 12:18:27 +0000 +++ b/storage/ndb/src/ndbapi/CMakeLists.txt 2011-06-14 10:42:04 +0000 @@ -21,7 +21,8 @@ ADD_LIBRARY(ndbapi STATIC NdbEventOperation.cpp NdbEventOperationImpl.cpp NdbIndexStat.cpp - NdbIndexStatImpl.cpp + NdbIndexStatImpl.cpp + NdbIndexStatFrmData.cpp NdbInterpretedCode.cpp TransporterFacade.cpp ClusterMgr.cpp === modified file 'storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp' --- a/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp 2011-06-12 16:54:32 +0000 +++ b/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp 2011-06-14 10:42:04 +0000 @@ -2282,7 +2282,7 @@ NdbIndexStatImpl::MemDefault::mem_free(v { Item* item = (Item*)ptr - 1; assert(item->m_magic == MemMagic); - Uint32 size = item->m_size; + size_t size = item->m_size; item->m_magic = 0; my_free(item, MYF(0)); assert(m_used >= size); === modified file 'storage/ndb/tools/CMakeLists.txt' --- a/storage/ndb/tools/CMakeLists.txt 2011-05-24 11:51:39 +0000 +++ b/storage/ndb/tools/CMakeLists.txt 2011-06-14 10:42:04 +0000 @@ -82,6 +82,14 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOUR ADD_CUSTOM_TARGET(ndbinfo_sql_run ALL DEPENDS ${PROJECT_SOURCE_DIR}/storage/ndb/tools/ndbinfo.sql) +MYSQL_ADD_EXECUTABLE(ndb_index_stat + ndb_index_stat.cpp + COMPONENT ClusterTools) +TARGET_LINK_LIBRARIES(ndb_index_stat ndbNDBT ndbgeneral) + +ADD_EXECUTABLE(ndb_dump_frm_data + ndb_dump_frm_data.cpp) +TARGET_LINK_LIBRARIES(ndb_dump_frm_data ndbNDBT ndbgeneral) IF (MYSQL_VERSION_ID LESS "50501") # Don't build or install this program anymore in 5.5+ === modified file 'storage/ndb/tools/ndb_dump_frm_data.cpp' --- a/storage/ndb/tools/ndb_dump_frm_data.cpp 2011-06-12 16:54:32 +0000 +++ b/storage/ndb/tools/ndb_dump_frm_data.cpp 2011-06-14 10:42:04 +0000 @@ -20,7 +20,7 @@ #include #include -static int oi = 1000; +// UNUSED static int oi = 1000; static struct my_option my_long_options[] = { === modified file 'storage/ndb/tools/ndb_index_stat.cpp' --- a/storage/ndb/tools/ndb_index_stat.cpp 2011-06-12 16:54:32 +0000 +++ b/storage/ndb/tools/ndb_index_stat.cpp 2011-06-14 10:42:04 +0000 @@ -20,6 +20,7 @@ #include #include #include +#include // stats options static const char* _dbname = 0; @@ -207,18 +208,18 @@ doquery() NdbIndexStat::Bound& b = (i == 0 ? b_lo : b_hi); bool strict = false; - if (random() % 3 != 0) + if (ndb_rand() % 3 != 0) { - if (random() % 3 != 0) + if (ndb_rand() % 3 != 0) { - Uint32 x = random(); + Uint32 x = ndb_rand(); CHK2(g_is->add_bound(b, &x) == 0, g_is->getNdbError()); } else { CHK2(g_is->add_bound_null(b) == 0, g_is->getNdbError()); } - bool strict = (random() % 2 == 0); + bool strict = (ndb_rand() % 2 == 0); g_is->set_bound_strict(b, strict); } } @@ -251,7 +252,7 @@ dostats(int i) if (_delete) { g_info << g_indname << ": delete stats" << endl; - if (random() % 2 == 0) + if (ndb_rand() % 2 == 0) { CHK2(g_dic->deleteIndexStat(*g_ind, *g_tab) == 0, g_dic->getNdbError()); } @@ -264,7 +265,7 @@ dostats(int i) if (_update) { g_info << g_indname << ": update stats" << endl; - if (random() % 2 == 0) + if (ndb_rand() % 2 == 0) { CHK2(g_dic->updateIndexStat(*g_ind, *g_tab) == 0, g_dic->getNdbError()); } @@ -615,8 +616,6 @@ main(int argc, char** argv) my_progname = "ndb_index_stat"; int ret; - srandom((unsigned)time(0)); - ndb_init(); ndb_opt_set_usage_funcs(short_usage_sub, usage); ret = handle_options(&argc, &argv, my_long_options, ndb_std_get_one_option); @@ -625,6 +624,10 @@ main(int argc, char** argv) setOutputLevel(_verbose ? 2 : 0); + unsigned seed = (unsigned)time(0); + g_info << "random seed " << seed << endl; + ndb_srand(seed); + ret = doall(); if (ret == -1) return NDBT_ProgramExit(NDBT_FAILED); --===============1968454610== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/pekka.nousiainen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: pekka.nousiainen@stripped\ # 4406pg8xgua9351m # target_branch: file:///export/space/pekka/ms/ms-wl4124-70/ # testament_sha1: 05d74a20866298add20ddd1462910c1a688a6e6d # timestamp: 2011-06-14 13:42:10 +0300 # base_revision_id: pekka.nousiainen@stripped\ # zmsj0oqru7pskjmm # # Begin bundle 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 KEhly3/LAA== --===============1968454610==--