Bug#27307793 IDENTIFIERS AND LOWER_CASE_TABLE_NAMES=2 INCONCISTENCY

Fixup table name comparisons to accept the fact that table name is
stored different in NDB on certain platforms.

Reviewed-by: Arnab Ray <[email protected]>

Change-Id: Ic8289842c32a6f2f5dc234ead91c639268d77105

Author: blaudden

sql/ha_ndbcluster.cc

@@ -10609,11 +10609,7 @@ int ha_ndbcluster::create(const char *name,
   set_dbname(name);
   set_tabname(name);
 
-  ndb_log_verbose(1,
-                  "Creating table, name: '%s', m_dbname: '%s', "
-                  "m_tabname: '%s', name in DD: '%s'",
-                  name, m_dbname, m_tabname,
-                  ndb_dd_table_get_name(table_def).c_str());
+  ndb_log_info("Creating table '%s'", name);
 
   Ndb_schema_dist_client schema_dist_client(thd);
 

sql/ndb_dd_client.cc

@@ -681,14 +681,9 @@ Ndb_dd_client::install_table(const char* schema_name, const char* table_name,
     return false;
   }
 
-  // Disable this check waiting for
-  // Bug#27307793 IDENTIFIERS AND LOWER_CASE_TABLE_NAMES=2 INCONCISTENCY
-  if (false)
-  {
   // Verify that table_name in the unpacked table definition
   // matches the table name to install
-  DBUG_ASSERT(install_table->name() == table_name);
-  }
+  DBUG_ASSERT(ndb_dd_fs_name_case(install_table->name()) == table_name);
 
   // Verify that table defintion unpacked from NDB
   // does not have any se_private fields set, those will be set

sql/ndb_dd_table.cc

@@ -119,11 +119,6 @@ bool ndb_dd_table_is_using_fixed_row_format(const dd::Table* table_def)
   return table_def->row_format() == dd::Table::RF_FIXED;
 }
 
-dd::String_type ndb_dd_table_get_name(const dd::Table* table_def)
-{
-  return table_def->name();
-}
-
 void
 ndb_dd_table_set_row_format(dd::Table* table_def,
                             const bool force_var_part)

sql/ndb_dd_table.h

@@ -37,11 +37,6 @@ namespace dd {
 
 /* Functions operating on dd::Table*, prefixed with ndb_dd_table_ */
 
-/*
-  Return name of table in table definition
-*/
-dd::String_type ndb_dd_table_get_name(const dd::Table* table_def);
-
 /*
    Save the tables object id and version in table definition
 */

sql/ndb_metadata.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2017, 2019, 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, version 2.0,
@@ -35,6 +35,7 @@
 #include "sql/dd/impl/properties_impl.h"
 #include "sql/dd/types/partition.h"
 #include "sql/dd/types/table.h"
+#include "sql/ndb_dd.h"
 #include "sql/ndb_dd_client.h"
 #include "sql/ndb_dd_table.h"
 #include "sql/ndb_ndbapi_util.h"
@@ -297,10 +298,8 @@ bool Ndb_metadata::compare_table_def(const dd::Table* t1, const dd::Table* t2)
 
   // name
   // When using lower_case_table_names==2 the table will be
-  // created using lowercase in NDB while still be original case in DD
-  // this causes a slight diff here. Workaround by skip comparing the
-  // name until BUG#27307793
-  //ctx.compare("name", t1->name(), t2->name());
+  // created using lowercase in NDB while still be original case in DD.
+  ctx.compare("name", ndb_dd_fs_name_case(t1->name()).c_str(), t2->name());
 
   // collation_id
   // ctx.compare("collation_id", t1->collation_id(), t2->collation_id());