diff options
author | unknown <joreland@mysql.com> | 2004-11-10 21:53:21 +0100 |
---|---|---|
committer | unknown <joreland@mysql.com> | 2004-11-10 21:53:21 +0100 |
commit | f000604a11280ebef9d9039b98ae6d151c5cfe25 (patch) | |
tree | ae348fc998611231020faabcae3b498f99ba0b6a /configure.in | |
parent | 8eae81ba317f8bb29312da53412755db99fcbcc3 (diff) | |
parent | b7a44f59adedb947c885d4fcfa3890a35116593e (diff) | |
download | mariadb-git-f000604a11280ebef9d9039b98ae6d151c5cfe25.tar.gz |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
configure.in:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/common/mgmcommon/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/Makefile.am:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 764261c6933..4d7640f206f 100644 --- a/configure.in +++ b/configure.in @@ -3153,6 +3153,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl support-files/MacOSX/Makefile mysql-test/Makefile dnl netware/Makefile dnl include/mysql_version.h dnl + ndb/include/ndb_version.h dnl cmd-line-utils/Makefile dnl cmd-line-utils/libedit/Makefile dnl zlib/Makefile dnl |