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

[jonas oreland]

 4569 jonas oreland	2011-10-04
      ndb - remove HugoQueryBuilder::O_RANDOM_OPTIONS, (and enumerate values for OM_RANDOM_OPTIONS)

    modified:
      storage/ndb/test/include/HugoQueryBuilder.hpp
 4568 jonas oreland	2011-10-03
      ndb - more fixes for empty hostname

    modified:
      storage/ndb/test/run-test/main.cpp
 4567 Jonas Oreland	2011-10-03
      ndb - add "atrt r" which restarts cluster rather than initial starts it

    modified:
      storage/ndb/test/run-test/atrt.hpp
      storage/ndb/test/run-test/main.cpp
      storage/ndb/test/run-test/setup.cpp
=== modified file 'storage/ndb/test/include/HugoQueryBuilder.hpp'
--- a/storage/ndb/test/include/HugoQueryBuilder.hpp	2011-07-04 13:37:56 +0000
+++ b/storage/ndb/test/include/HugoQueryBuilder.hpp	2011-10-04 06:23:21 +0000
@@ -60,15 +60,9 @@ public:
     /**
      * Query might table scan
      */
-    O_TABLE_SCAN = 0x20,
-
-    /**
-     * If not any options set, random query qill be created
-     */
-    O_RANDOM_OPTIONS = (OptionMask)((~(OptionMask)0) & 
-                                    ~(OptionMask)(O_SCAN | O_LOOKUP))
+    O_TABLE_SCAN = 0x20
   };
-  static const OptionMask OM_RANDOM_OPTIONS = (OptionMask)O_RANDOM_OPTIONS;
+  static const OptionMask OM_RANDOM_OPTIONS = (OptionMask)(O_PK_INDEX | O_UNIQUE_INDEX | O_ORDERED_INDEX | O_TABLE_SCAN);
 
   HugoQueryBuilder(Ndb* ndb, const NdbDictionary::Table**tabptr, 
                    OptionMask om = OM_RANDOM_OPTIONS){

=== modified file 'storage/ndb/test/run-test/main.cpp'
--- a/storage/ndb/test/run-test/main.cpp	2011-10-03 11:06:06 +0000
+++ b/storage/ndb/test/run-test/main.cpp	2011-10-03 14:59:24 +0000
@@ -837,7 +837,11 @@ parse_args(int argc, char** argv)
 
 bool
 connect_hosts(atrt_config& config){
-  for(size_t i = 0; i<config.m_hosts.size(); i++){
+  for(size_t i = 0; i<config.m_hosts.size(); i++)
+  {
+    if (config.m_hosts[i]->m_hostname.length() == 0)
+      continue;
+
     if(config.m_hosts[i]->m_cpcd->connect() != 0){
       g_logger.error("Unable to connect to cpc %s:%d",
 		     config.m_hosts[i]->m_cpcd->getHost(),
@@ -1129,7 +1133,11 @@ update_status(atrt_config& config, int){
   
   Vector<SimpleCpcClient::Process> dummy;
   m_procs.fill(config.m_hosts.size(), dummy);
-  for(size_t i = 0; i<config.m_hosts.size(); i++){
+  for(size_t i = 0; i<config.m_hosts.size(); i++)
+  {
+    if (config.m_hosts[i]->m_hostname.length() == 0)
+      continue;
+
     Properties p;
     config.m_hosts[i]->m_cpcd->list_processes(m_procs[i], p);
   }
@@ -1343,6 +1351,9 @@ gather_result(atrt_config& config, int *
 
   for(size_t i = 0; i<config.m_hosts.size(); i++)
   {
+    if (config.m_hosts[i]->m_hostname.length() == 0)
+      continue;
+
     tmp.appfmt(" %s:%s/*", 
 	       config.m_hosts[i]->m_hostname.c_str(),
 	       config.m_hosts[i]->m_basedir.c_str());
@@ -1422,6 +1433,9 @@ deploy(int d, atrt_config & config)
 {
   for (size_t i = 0; i<config.m_hosts.size(); i++)
   {
+    if (config.m_hosts[i]->m_hostname.length() == 0)
+      continue;
+
     if (d & 1)
     {
       if (!do_rsync(g_basedir, config.m_hosts[i]->m_hostname.c_str()))

No bundle (reason: useless for push emails).