summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/mysql_waitpid.c1
-rw-r--r--extra/perror.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/extra/mysql_waitpid.c b/extra/mysql_waitpid.c
index bff1752ec21..c228cc52c8b 100644
--- a/extra/mysql_waitpid.c
+++ b/extra/mysql_waitpid.c
@@ -20,6 +20,7 @@
#include <my_global.h>
#include <m_string.h>
+#include <my_sys.h>
#include <my_getopt.h>
#include <signal.h>
#include <errno.h>
diff --git a/extra/perror.c b/extra/perror.c
index f1b1a4c2005..a28626fd873 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -42,7 +42,7 @@ static struct my_option my_long_options[] =
NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_NDBCLUSTER_DB
{"ndb", 0, "Ndbcluster storage engine specific error codes.", (gptr*) &ndb_code,
- (gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
+ (gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
#ifdef HAVE_SYS_ERRLIST
{"all", 'a', "Print all the error messages and the number.",
@@ -222,7 +222,7 @@ int main(int argc,char *argv[])
#ifdef HAVE_NDBCLUSTER_DB
if (ndb_code)
{
- if (ndb_error_string(code, ndb_string, 1024) < 0)
+ if (ndb_error_string(code, ndb_string, sizeof(ndb_string)) < 0)
msg= 0;
else
msg= ndb_string;