Commit c1905226 authored by unknown's avatar unknown

Enable WL#1892 for binlog, wrong signature

parent 50029d1c
......@@ -468,7 +468,8 @@ void ha_ndbcluster::no_uncommitted_rows_reset(THD *thd)
int
ha_ndbcluster::invalidate_dictionary_cache(TABLE_SHARE *share, Ndb *ndb,
const char *tabname, bool global)
const char *dbname, const char *tabname,
bool global)
{
NDBDICT *dict= ndb->getDictionary();
DBUG_ENTER("invalidate_dictionary_cache");
......@@ -512,7 +513,7 @@ ha_ndbcluster::invalidate_dictionary_cache(TABLE_SHARE *share, Ndb *ndb,
void ha_ndbcluster::invalidate_dictionary_cache(bool global)
{
NDBDICT *dict= get_ndb()->getDictionary();
if (invalidate_dictionary_cache(table_share, get_ndb(), m_tabname, global))
if (invalidate_dictionary_cache(table_share, get_ndb(), m_dbname, m_tabname, global))
return;
/* Invalidate indexes */
for (uint i= 0; i < table_share->keys; i++)
......
......@@ -662,8 +662,9 @@ static void set_tabname(const char *pathname, char *tabname);
bool check_if_incompatible_data(HA_CREATE_INFO *info,
uint table_changes);
static void invalidate_dictionary_cache(TABLE_SHARE *share, Ndb *ndb,
const char *tabname, bool global);
static int invalidate_dictionary_cache(TABLE_SHARE *share, Ndb *ndb,
const char *dbname, const char *tabname,
bool global);
private:
friend int ndbcluster_drop_database_impl(const char *path);
......
......@@ -1236,6 +1236,7 @@ ndb_handle_schema_change(THD *thd, Ndb *ndb, NdbEventOperation *pOp,
ndb->setDatabaseName(share->table->s->db.str);
ha_ndbcluster::invalidate_dictionary_cache(share->table->s,
ndb,
share->table->s->db.str,
share->table->s->table_name.str,
TRUE);
remote_drop_table= 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment