diff options
| author | unknown <knielsen@ymer.(none)> | 2007-02-26 08:12:02 +0100 |
|---|---|---|
| committer | unknown <knielsen@ymer.(none)> | 2007-02-26 08:12:02 +0100 |
| commit | 1eb71c68cb1b2f335a8e6b393cdb3e724ea65a0a (patch) | |
| tree | 6ef039193301c16610b5aac1f58d53e7da8a976a | |
| parent | 3c9904123b6e2a07dff025f5e92c82d18afdad58 (diff) | |
| parent | 8c336fbc46fd3e8d1a7cc073883270c5a2ac3cc8 (diff) | |
| download | mariadb-git-1eb71c68cb1b2f335a8e6b393cdb3e724ea65a0a.tar.gz | |
Merge ymer.(none):/tmp/mysql-5.0
into ymer.(none):/tmp/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/include/util/OutputStream.hpp:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
Auto merged
| -rw-r--r-- | support-files/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/support-files/Makefile.am b/support-files/Makefile.am index f2533100117..af835bf350e 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -28,7 +28,8 @@ EXTRA_DIST = mysql.spec.sh \ binary-configure.sh \ magic \ MySQL-shared-compat.spec.sh \ - ndb-config-2-node.ini.sh + ndb-config-2-node.ini.sh \ + compiler_warnings.supp SUBDIRS = MacOSX RHEL4-SElinux |