manual merge

sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged

1 files changed, 3 insertions, 0 deletions

diff --git a/storage/ndb/tools/restore/consumer_restore.cpp b/storage/ndb/tools/restore/consumer_restore.cpp
index 200925bf8bb..e4d8f98363a 100644
--- a/storage/ndb/tools/restore/consumer_restore.cpp
+++ b/storage/ndb/tools/restore/consumer_restore.cpp
@@ -30,6 +30,8 @@ static Uint32 get_part_id(const NdbDictionary::Table *table,
                           Uint32 hash_value);
 
 extern const char * g_connect_string;
+extern BaseString g_options;
+
 bool
 BackupRestore::init()
 {
@@ -39,6 +41,7 @@ BackupRestore::init()
     return true;
 
   m_cluster_connection = new Ndb_cluster_connection(g_connect_string);
+  m_cluster_connection->set_name(g_options.c_str());
   if(m_cluster_connection->connect(12, 5, 1) != 0)
   {
     return false;