diff options
| -rw-r--r-- | extra/perror.c | 4 | ||||
| -rw-r--r-- | sql/Makefile.am | 1 |
2 files changed, 3 insertions, 2 deletions
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; diff --git a/sql/Makefile.am b/sql/Makefile.am index 1a984604dbf..3f8a228b94b 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -45,6 +45,7 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @innodb_system_libs@ \ @ndbcluster_libs@ @ndbcluster_system_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ +mysqld_DEPENDENCIES = @ndbcluster_libs@ @ndbcluster_system_libs@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ item_create.h item_subselect.h item_row.h \ |