wl#10321 new mysqld status variable Ndb_system_name

Author: jdduncan

mysql-test/suite/ndb/r/ndb_basic.result

@@ -110,6 +110,7 @@ Ndb_scan_count	#
 Ndb_schema_locks_count	#
 Ndb_slave_max_replicated_epoch	#
 Ndb_sorted_scan_count	#
+Ndb_system_name	#
 SHOW GLOBAL VARIABLES WHERE Variable_name LIKE 'ndb\_%' and 
 Variable_name NOT LIKE 'ndb_dbg\_%';
 Variable_name	Value

sql/ha_ndbcluster.cc

@@ -660,6 +660,7 @@ static int update_status_variables(Thd_ndb *thd_ndb,
   }
   ns->number_of_data_nodes= c->no_db_nodes();
   ns->connect_count= c->get_connect_count();
+  ns->system_name = c->get_system_name();
   ns->last_commit_epoch_server= ndb_get_latest_trans_gci();
   if (thd_ndb)
   {
@@ -781,6 +782,7 @@ SHOW_VAR ndb_status_variables_dynamic[]= {
   {"last_commit_epoch_session", 
                          (char*) &g_ndb_status.last_commit_epoch_session, 
                                                                       SHOW_LONGLONG, SHOW_SCOPE_GLOBAL},
+  {"system_name", (char*) &g_ndb_status.system_name, SHOW_CHAR_PTR, SHOW_SCOPE_GLOBAL},
   {NullS, NullS, SHOW_LONG, SHOW_SCOPE_GLOBAL}
 };
 

sql/ha_ndbcluster.h

@@ -131,6 +131,7 @@ struct st_ndb_status {
   long transaction_no_hint_count[MAX_NDB_NODES];
   long transaction_hint_count[MAX_NDB_NODES];
   long long api_client_stats[Ndb::NumClientStatistics];
+  const char * system_name;
 };
 
 int ndbcluster_commit(handlerton *hton, THD *thd, bool all);

storage/ndb/include/ndbapi/ndb_cluster_connection.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -203,6 +203,11 @@ class Ndb_cluster_connection {
   void set_auto_reconnect(int value);
   int get_auto_reconnect() const;
 
+  /**
+   *  Get system.name from cluster configuration
+   */
+  const char * get_system_name() const;
+
   /**
    * Collect client statistics for all Ndb objects in this connection
    * Note that this locks the ndb objects while collecting data.

storage/ndb/src/ndbapi/ndb_cluster_connection.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1154,6 +1154,13 @@ Ndb_cluster_connection_impl::configure(Uint32 nodeId,
       m_config.m_waitfor_timeout = timeout;
     }
   }
+
+  // System name
+  ndb_mgm_configuration_iterator s_iter(config, CFG_SECTION_SYSTEM);
+  const char * tmp_system_name;
+  s_iter.get(CFG_SYS_NAME, & tmp_system_name);
+  m_system_name.assign(tmp_system_name);
+
   DBUG_RETURN(init_nodes_vector(nodeId, config));
 }
 
@@ -1224,6 +1231,11 @@ void Ndb_cluster_connection::set_application_address(const char * addr, int port
   m_impl.set_application_address(addr, port);
 }
 
+const char * Ndb_cluster_connection::get_system_name() const
+{
+  return m_impl.m_system_name.c_str();
+}
+
 int Ndb_cluster_connection_impl::connect(int no_retries,
                                          int retry_delay_in_seconds,
                                          int verbose)

storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by