diff options
| author | jonas@eel.(none) <> | 2007-02-13 22:03:44 +0100 |
|---|---|---|
| committer | jonas@eel.(none) <> | 2007-02-13 22:03:44 +0100 |
| commit | 0657f1b58d31fd0dad407edcb36b3496a0e7784b (patch) | |
| tree | a24b5abe63dc82ff415d61a6a084f4e34a76e5c6 /storage/ndb/src | |
| parent | 743909180ff7f64a3ac00ff5cfc399909cb76b22 (diff) | |
| parent | fc94ac8a10cbb9d5a1778e5f658feaeafd2a38a5 (diff) | |
| download | mariadb-git-0657f1b58d31fd0dad407edcb36b3496a0e7784b.tar.gz | |
Merge localhost:/home/jonas/src/51-work
into eel.(none):/home/jonas/src/51-work
Diffstat (limited to 'storage/ndb/src')
| -rw-r--r-- | storage/ndb/src/cw/cpcd/Makefile.am | 2 | ||||
| -rw-r--r-- | storage/ndb/src/mgmsrv/InitConfigFileParser.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/ndb/src/cw/cpcd/Makefile.am b/storage/ndb/src/cw/cpcd/Makefile.am index dfd2e8c270b..efc828e21a9 100644 --- a/storage/ndb/src/cw/cpcd/Makefile.am +++ b/storage/ndb/src/cw/cpcd/Makefile.am @@ -26,7 +26,7 @@ LDADD_LOC = \ include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/type_util.mk.am -ndb_cpcd_LDFLAGS = @ndb_bin_am_ldflags@ +ndb_cpcd_LDFLAGS = -static @ndb_bin_am_ldflags@ # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp index ca0471f97b4..c691951d584 100644 --- a/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp +++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp @@ -836,7 +836,7 @@ InitConfigFileParser::parse_mycnf() opt.arg_type = REQUIRED_ARG; options.push_back(opt); - opt.name = "api"; + opt.name = "ndbapi"; opt.id = 256; opt.value = (gptr*)malloc(sizeof(char*)); opt.var_type = GET_STR; |