diff options
| author | unknown <ndbdev@dl145b.mysql.com> | 2005-10-10 17:15:25 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145b.mysql.com> | 2005-10-10 17:15:25 +0200 |
| commit | 82fde89c7076d017b1b52f453c13c283c1a59342 (patch) | |
| tree | 4a27c6cbc5220245591bb835fe4fdf9773220967 /libmysql_r/Makefile.am | |
| parent | 28a5775b0812384769a57aaec40430f35af0fa3c (diff) | |
| parent | 748b5ce3f086e88d0d7f0166628114d6379298f6 (diff) | |
| download | mariadb-git-82fde89c7076d017b1b52f453c13c283c1a59342.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
support-files/mysql.spec.sh:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
Diffstat (limited to 'libmysql_r/Makefile.am')
0 files changed, 0 insertions, 0 deletions