summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2007-01-23 16:42:03 +0200
committerunknown <monty@mysql.com/narttu.mysql.fi>2007-01-23 16:42:03 +0200
commitf3f82ef594901cc284d4e2f39667cff07cc9fa18 (patch)
tree0e45a04dc98f31226612beac168f784f63ca4c10 /sql
parent614b3d67d4bf9973cb57ee44492749811085fc1a (diff)
downloadmariadb-git-f3f82ef594901cc284d4e2f39667cff07cc9fa18.tar.gz
Avoid compiler warnings on powermacg5
Fixed compilation error when trying to compile libmysqld on powermac configure.in: Added flag if __cxa_pure_virtual() should be defined. Without this flag, we get a warning from my_global.h for every compiled file on powermacg5 extra/yassl/taocrypt/include/type_traits.hpp: Avoid compiler warning include/my_global.h: Avoid compiler warning on powermacg5 sql/mysqld.cc: Fix compiler error when compiling embedded on powermac
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 15580f944a4..7a19e26a8b7 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -900,7 +900,7 @@ void kill_mysql(void)
{
DBUG_ENTER("kill_mysql");
-#ifdef SIGNALS_DONT_BREAK_READ
+#if defined(SIGNALS_DONT_BREAK_READ) && !defined(EMBEDDED_LIBRARY)
abort_loop=1; // Break connection loops
close_server_sock(); // Force accept to wake up
#endif