Bug #24383742 NDB : NDB_SHOW_TABLES MISSING TYPE NAME TEXT FOR SOME TYPES

Problem:
--------

Type column entries for HashMap missing from ndb_show_tables output

Fix:
----

Added missing case for HashMap in ndb_show_tables. Also added the
missing mapping of the HashMap table type from DictTabInfo to
NdbDictionary

Author: arnabray21

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

@@ -39,3 +39,21 @@ Please specify database name using the -d option. Use option --help for more det
 NDBT_ProgramExit: 1 - Failed
 
 DROP DATABASE TEST_DB;
+create temporary table if not exists ndb_show_tables_results (
+id int,
+type varchar(20),
+state varchar(20),
+logging varchar(20),
+_database varchar(255),
+_schema varchar(20),
+name varchar(255)
+);
+
+ndb_show_tables completed.....
+
+select type from ndb_show_tables_results
+where type like '%HashMap%'
+limit 1;
+type
+'HashMap'
+drop table ndb_show_tables_results;

mysql-test/suite/ndb/t/ndb_show_tables.test

@@ -38,3 +38,24 @@ DROP TABLE TEST_DB.t1;
 --error 1
 --exec $NDB_SHOW_TABLES --no-defaults t1
 DROP DATABASE TEST_DB;
+
+# BUG #24383742 NDB : NDB_SHOW_TABLES MISSING TYPE NAME TEXT FOR SOME TYPES
+# Create temporary table to store ndb_show_tables result
+create temporary table if not exists ndb_show_tables_results (
+ id int,
+ type varchar(20),
+ state varchar(20),
+ logging varchar(20),
+ _database varchar(255),
+ _schema varchar(20),
+ name varchar(255)
+);
+
+--source ndb_show_tables_result.inc
+
+# Check type of HashMap
+select type from ndb_show_tables_results
+where type like '%HashMap%'
+limit 1;
+
+drop table ndb_show_tables_results;

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

@@ -2805,6 +2805,7 @@ objectTypeMapping[] = {
   { DictTabInfo::ForeignKey,         NdbDictionary::Object::ForeignKey },
   { DictTabInfo::FKParentTrigger,    NdbDictionary::Object::FKParentTrigger },
   { DictTabInfo::FKChildTrigger,     NdbDictionary::Object::FKChildTrigger },
+  { DictTabInfo::HashMap,            NdbDictionary::Object::HashMap },
   { -1, -1 }
 };
 

storage/ndb/tools/listTables.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2016, 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
@@ -158,6 +158,9 @@ list(const char * tabname,
         case NdbDictionary::Object::FKChildTrigger:
             strcpy(type, "FKChildTrigger");
             break;
+        case NdbDictionary::Object::HashMap:
+            strcpy(type, "HashMap");
+            break;
         default:
 	  sprintf(type, "%d", (int)elt.type);
             break;