Navigation Menu

Skip to content

Commit

Permalink
mysql57: follow plugin_data API change
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Mar 17, 2015
1 parent 2fda101 commit 78c1890
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion mrn_table.cpp
Expand Up @@ -40,6 +40,12 @@
# define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name))
#endif

#if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P)
# define MRN_PLUGIN_DATA(plugin, type) plugin_data<type>(plugin)
#else
# define MRN_PLUGIN_DATA(plugin, type) plugin_data(plugin, type)
#endif

#define LEX_STRING_IS_EMPTY(string) \
((string).length == 0 || !(string).str || (string).str[0] == '\0')

Expand Down Expand Up @@ -474,7 +480,7 @@ int mrn_parse_table_param(MRN_SHARE *share, TABLE *table)
error = ER_UNKNOWN_STORAGE_ENGINE;
goto error;
}
share->hton = plugin_data(share->plugin, handlerton *);
share->hton = MRN_PLUGIN_DATA(share->plugin, handlerton *);
share->wrapper_mode = TRUE;
}
}
Expand Down

0 comments on commit 78c1890

Please sign in to comment.