summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/mysqld.cc2
-rw-r--r--sql/sql_parse.h4
2 files changed, 1 insertions, 5 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a2c1db09aa1..e8e7b5bb3ef 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7689,7 +7689,7 @@ static char *get_relative_path(const char *path)
1 if len(path) > FN_REFLEN
*/
-static bool
+bool
fn_format_relative_to_data_home(char * to, const char *name,
const char *dir, const char *extension)
{
diff --git a/sql/sql_parse.h b/sql/sql_parse.h
index 9ef6d1b4c2f..0dae572b6a4 100644
--- a/sql/sql_parse.h
+++ b/sql/sql_parse.h
@@ -199,10 +199,6 @@ check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables,
{ return false; }
#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 */
bool check_global_access(THD *thd, ulong want_access);