Commit 6e63f41f authored by Mats Kindahl's avatar Mats Kindahl

WL#5030: Splitting mysql_priv.h

Minor fixes required because of changes since patches were developed.
parent 118ad60a
...@@ -7689,7 +7689,7 @@ static char *get_relative_path(const char *path) ...@@ -7689,7 +7689,7 @@ static char *get_relative_path(const char *path)
1 if len(path) > FN_REFLEN 1 if len(path) > FN_REFLEN
*/ */
static bool bool
fn_format_relative_to_data_home(char * to, const char *name, fn_format_relative_to_data_home(char * to, const char *name,
const char *dir, const char *extension) const char *dir, const char *extension)
{ {
......
...@@ -199,10 +199,6 @@ check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables, ...@@ -199,10 +199,6 @@ check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables,
{ return false; } { return false; }
#endif /*NO_EMBEDDED_ACCESS_CHECKS*/ #endif /*NO_EMBEDDED_ACCESS_CHECKS*/
#ifdef EMBEDDED_LIBRARY
#define check_stack_overrun(A, B, C) 0
#endif /* EMBEDDED_LIBRARY */
/* These were under the INNODB_COMPATIBILITY_HOOKS */ /* These were under the INNODB_COMPATIBILITY_HOOKS */
bool check_global_access(THD *thd, ulong want_access); bool check_global_access(THD *thd, ulong want_access);
......
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