Bug#29955295 NDBCLUSTER FUNCTION PARAMETER SHADOWS HANDLER::TABLE

Compiler warning showing that the parameter "table" of functions ha_ndbcluster::unpack_record_and_set_generated_fields() and ha_ndbcluster::get_partition_row_type() hides the handler::table member. /home/mblaudd/mysql/trunk/sql/ha_ndbcluster.cc:7094:10: warning: parameter 'table' shadows member inherited from type 'handler' [-Wshadow-field] TABLE *table, ^ /home/mblaudd/mysql/trunk/sql/handler.h:3990:10: note: declared here TABLE *table; /* The current open table */ ^ /home/mblaudd/mysql/trunk/sql/ha_ndbcluster.cc:16609:22: warning: parameter 'table' shadows member inherited from type 'handler' [-Wshadow-field] const dd::Table *table MY_ATTRIBUTE((unused)), ^ /home/mblaudd/mysql/trunk/sql/handler.h:3990:10: note: declared here TABLE *table; /* The current open table */ ^ Fix ha_ndbcluster::unpack_record_and_set_generated_fields() by removing parameter and use handler::table directly. Fix ha_ndbcluster::get_partition_row_type() by renaming the dd::Table parameter to "table_def" like in other functions taking a dd::Table. Also fix same problem in ha_ndbcluster::get_fk_data_for_truncate() by renameing parameter to "ndbtab". Change-Id: I623e967da6f6ca9e623667db0c30ec9790eb3a87

Author: blaudden

sql/ha_ndb_ddl_fk.cc

@@ -2599,13 +2599,14 @@ ha_ndbcluster::inplace__drop_fks(THD * thd, Ndb* ndb, NDBDICT * dict,
 */
 
 int
-ha_ndbcluster::get_fk_data_for_truncate(NDBDICT* dict, const NDBTAB* table,
+ha_ndbcluster::get_fk_data_for_truncate(NdbDictionary::Dictionary* dict,
+ const NdbDictionary::Table* ndbtab,
  Ndb_fk_list& fk_list)
 {
  DBUG_ENTER("ha_ndbcluster::get_fk_data_for_truncate");
 
  NDBDICT::List obj_list;
- if (dict->listDependentObjects(obj_list, *table) != 0)
+ if (dict->listDependentObjects(obj_list, *ndbtab) != 0)
  {
  ERR_RETURN(dict->getNdbError());
  }

sql/ha_ndbcluster.cc

@@ -3715,7 +3715,7 @@ int ha_ndbcluster::fetch_next_pushed()
  {
  DBUG_ASSERT(m_next_row!=NULL);
  DBUG_PRINT("info", ("One more record found")); 
- const int ignore = unpack_record_and_set_generated_fields(table, table->record[0],
+ const int ignore = unpack_record_and_set_generated_fields(table->record[0],
  m_next_row);
 // m_thd_ndb->m_pushed_reads++;
  if (likely(!ignore))
@@ -3766,7 +3766,7 @@ ha_ndbcluster::index_read_pushed(uchar *buf, const uchar *key,
  if (result == NdbQuery::NextResult_gotRow)
  {
  DBUG_ASSERT(m_next_row!=NULL);
- const int ignore = unpack_record_and_set_generated_fields(table, buf, m_next_row);
+ const int ignore = unpack_record_and_set_generated_fields(buf, m_next_row);
  m_thd_ndb->m_pushed_reads++;
  if (unlikely(ignore))
  {
@@ -7091,7 +7091,6 @@ int ha_ndbcluster::unpack_record(uchar *dst_row, const uchar *src_row)
 }
 
 int ha_ndbcluster::unpack_record_and_set_generated_fields(
- TABLE *table,
  uchar *dst_row,
  const uchar *src_row)
 {
@@ -15956,7 +15955,7 @@ int ha_ndbcluster::multi_range_read_next(char **range_info)
  current_range_no);
  /* Copy out data from the new row. */
  const int ignore =
- unpack_record_and_set_generated_fields(table, table->record[0],
+ unpack_record_and_set_generated_fields(table->record[0],
  m_next_row);
  /*
  Mark that we have used this row, so we need to fetch a new
@@ -16601,13 +16600,7 @@ static MYSQL_SYSVAR_ENUM(
  &distribution_typelib /* typelib */
 );
 
-/* Get partition row type
-@param[in] table partition_table
-@param[in] part_id Id of partition for which row type to be retrieved
-@return Partition row type. */
-enum row_type ha_ndbcluster::get_partition_row_type(
- const dd::Table *table MY_ATTRIBUTE((unused)),
- uint part_id MY_ATTRIBUTE((unused))) {
+enum row_type ha_ndbcluster::get_partition_row_type(const dd::Table*, uint) {
  return table_share->real_row_type;
 }
 

sql/ha_ndbcluster.h

@@ -211,7 +211,7 @@ class ha_ndbcluster: public handler, public Partition_handler
  @param[in] table partition table
  @param[in] part_id Id of partition for which row type to be retrieved
  @return Partition row type. */
- enum row_type get_partition_row_type(const dd::Table *table,
+ enum row_type get_partition_row_type(const dd::Table *table_def,
  uint part_id) override;
 
  private:
@@ -570,7 +570,7 @@ class ha_ndbcluster: public handler, public Partition_handler
  int next_result(uchar *buf); 
  int close_scan();
  int unpack_record(uchar *dst_row, const uchar *src_row);
- int unpack_record_and_set_generated_fields(TABLE *, uchar *dst_row,
+ int unpack_record_and_set_generated_fields(uchar *dst_row,
  const uchar *src_row);
  void set_dbname(const char *pathname);
  void set_tabname(const char *pathname);