diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index c6e205f4729..9617d19caae 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -330,7 +330,12 @@ void mysql_execute_command(void);
 bool do_command(THD *thd);
 bool dispatch_command(enum enum_server_command command, THD *thd,
 		      char* packet, uint packet_length);
+#ifndef EMBEDDED_LIBRARY
 bool check_stack_overrun(THD *thd,char *dummy);
+#else
+#define check_stack_overrun(A, B) 0
+#endif
+
 bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables);
 void table_cache_init(void);
 void table_cache_free(void);
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 9e222c4f944..0ffdb68a179 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2697,6 +2697,7 @@ static bool check_merge_table_access(THD *thd, char *db,
 #define used_stack(A,B) (long) (B - A)
 #endif
 
+#ifndef EMBEDDED_LIBRARY
 bool check_stack_overrun(THD *thd,char *buf __attribute__((unused)))
 {
   long stack_used;
@@ -2710,6 +2711,7 @@ bool check_stack_overrun(THD *thd,char *buf __attribute__((unused)))
   }
   return 0;
 }
+#endif /* EMBEDDED_LIBRARY */
 
 #define MY_YACC_INIT 1000			// Start with big alloc
 #define MY_YACC_MAX  32000			// Because of 'short'