diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-05-10 20:35:14 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-05-10 20:35:14 +0200 |
| commit | 0de78e66c2920350143d1399510ac5bb0bb16a69 (patch) | |
| tree | 99c67688e19bf89ec22a80399bd0a79bc83a6d62 /scripts/mysql_tableinfo.sh | |
| parent | beaedea1eebc8c76450752642c150b1ee58961eb (diff) | |
| parent | edcdc57bff956bccd085de326d200a698919ac5c (diff) | |
| download | mariadb-git-0de78e66c2920350143d1399510ac5bb0bb16a69.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
storage/ndb/src/cw/cpcd/Process.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/DbtupCommit.cpp:
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/Makefile.am:
Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'scripts/mysql_tableinfo.sh')
0 files changed, 0 insertions, 0 deletions