summaryrefslogtreecommitdiff
path: root/include/my_handler.h
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2008-03-28 18:45:03 +0200
committerunknown <gkodinov/kgeorge@magare.gmz>2008-03-28 18:45:03 +0200
commitea33ceb75f11cbf3b4d567224cb0ba1fb0b4cf43 (patch)
tree4711cd6d2ffea0a95e9b60ca57e1ad8c9a490ff9 /include/my_handler.h
parent33b82cec56d4d606f5ff099dcbcaf2036bab2a1b (diff)
downloadmariadb-git-ea33ceb75f11cbf3b4d567224cb0ba1fb0b4cf43.tar.gz
Fixed problem with non-synchronous error lists
in perror and handler descriptors (BUG#25177) Fixed problem of masking mysql error by system error in perror (BUG#23028) extra/perror.c: Used common handlers error list. Fixed BUG#23028 ignoring mysql error in case of OS and mysql error codes overlapping. include/my_base.h: Added errors of maria engine. Fixed incorrect comment in #define (can be cause of seriouse problems) include/my_handler.h: Added ability to be included into C++ code. mysys/my_handler.c: Error texts moved to the separate files. mysys/my_handler_errors.h: New BitKeeper file ``mysys/my_handler_errors.h''
Diffstat (limited to 'include/my_handler.h')
-rw-r--r--include/my_handler.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_handler.h b/include/my_handler.h
index dabe73bd138..a3376cb74a2 100644
--- a/include/my_handler.h
+++ b/include/my_handler.h
@@ -19,6 +19,9 @@
#define _my_handler_h
#include "myisampack.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
/*
There is a hard limit for the maximum number of keys as there are only
@@ -118,5 +121,8 @@ extern void my_handler_error_unregister(void);
this amount of bytes.
*/
#define portable_sizeof_char_ptr 8
+#ifdef __cplusplus
+}
+#endif
#endif /* _my_handler_h */