summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-02-02 03:47:06 +0200
committerunknown <monty@donna.mysql.com>2001-02-02 03:47:06 +0200
commit1d63e924d7e38d5c653b8fd8be044f303124d0a9 (patch)
tree19641f8502749972f84a35f4dbc182e18e30af5a /sql/mysqld.cc
parent50c4cc1f8b7e2f265d1e98ee730b65d345d5a398 (diff)
downloadmariadb-git-1d63e924d7e38d5c653b8fd8be044f303124d0a9.tar.gz
Portability fixes
Changed TRUNCATE table_name -> TRUNCATE TABLE table_name Docs/manual.texi: Changed TRUNCATE table_name -> TRUNCATE TABLE table_name client/mysql.cc: Don't crash when using -q with long fields include/my_net.h: Portability fix mysql-test/t/truncate.test: Changed TRUNCATE table_name -> TRUNCATE TABLE table_name readline/input.c: Portability fix scripts/make_binary_distribution.sh: Portability fix sql-bench/crash-me.sh: Portability fix sql/mini_client.cc: Portability fix sql/mysqld.cc: cleanup sql/share/dutch/errmsg.txt: Fixed typo sql/share/english/errmsg.txt: Fixed typo sql/share/greek/errmsg.txt: Fixed typo sql/share/hungarian/errmsg.txt: Fixed typo sql/share/italian/errmsg.txt: New translated messages sql/share/portuguese/errmsg.txt: Fixed typo sql/share/romanian/errmsg.txt: Fixed typo sql/share/slovak/errmsg.txt: Fixed typo sql/share/spanish/errmsg.txt: Fixed typo sql/sql_yacc.yy: Changed TRUNCATE table_name -> TRUNCATE TABLE table_name support-files/Makefile.am: Portability fix
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 07e0bd4131a..812fe2177ac 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -34,9 +34,7 @@
#define ONE_THREAD
#endif
-#ifdef __cplusplus
extern "C" { // Because of SCO 3.2V4.2
-#endif
#include <errno.h>
#include <sys/stat.h>
#ifndef __GNU_LIBRARY__
@@ -104,9 +102,8 @@ inline void reset_floating_point_exceptions()
#define reset_floating_point_exceptions()
#endif /* __FreeBSD__ && HAVE_IEEEFP_H */
-#ifdef __cplusplus
-}
-#endif
+} /* cplusplus */
+
#if defined(HAVE_LINUXTHREADS)
#define THR_KILL_SIGNAL SIGINT