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 /ndb/src/mgmclient | |
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 'ndb/src/mgmclient')
-rw-r--r-- | ndb/src/mgmclient/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ndb/src/mgmclient/Makefile.am b/ndb/src/mgmclient/Makefile.am index cd6ddb0ad57..88bd3c4f529 100644 --- a/ndb/src/mgmclient/Makefile.am +++ b/ndb/src/mgmclient/Makefile.am @@ -23,3 +23,5 @@ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@ # Don't update the files from bitkeeper %::SCCS/s.% + +windoze-dsp: |