Commit b67566c2 authored by unknown's avatar unknown
Browse files

Post review fixes of WL#1892

parent 83f6d737

sql/ha_ndbcluster.cc

+18 −19
Original line number Diff line number Diff line
@@ -987,9 +987,7 @@ int ha_ndbcluster::get_metadata(const char *path) 
      DBUG_RETURN(1);

    }

    

    if (cmp_frm(tab, pack_data, pack_length))

    {

      if (m_share->state != NSS_ALTERED)

    if (m_share->state != NSS_ALTERED && cmp_frm(tab, pack_data, pack_length))

    {

      if (!invalidating_ndb_table)

      {
@@ -1009,7 +1007,6 @@ int ha_ndbcluster::get_metadata(const char *path) 
        invalidating_ndb_table= FALSE;

      }

    }

    }

    else

    {

      invalidating_ndb_table= FALSE;
@@ -5410,6 +5407,8 @@ int ndbcluster_find_all_files(THD *thd) 
          sql_print_information("NDB: mismatch in frm for %s.%s, discovering...",

                                elmt.database, elmt.name);

        }

        if (share)

          free_share(&share);

      }

      my_free((char*) data, MYF(MY_ALLOW_ZERO_PTR));

      my_free((char*) pack_data, MYF(MY_ALLOW_ZERO_PTR));