diff options
author | unknown <jonas@perch.ndb.mysql.com> | 2006-08-01 17:06:02 +0200 |
---|---|---|
committer | unknown <jonas@perch.ndb.mysql.com> | 2006-08-01 17:06:02 +0200 |
commit | 2f8bc2141ef9045b4dafe57d5946e40cf8cbf7c7 (patch) | |
tree | 5cce023ea5da7bc6bd2298bdea451528616394d5 /ndb/test/src | |
parent | eb94c0c9f2aeb799926910c901fd53f47ebde011 (diff) | |
parent | 0752f2d52b3d3f19fe57d890d7fc0cd25d7f522a (diff) | |
download | mariadb-git-2f8bc2141ef9045b4dafe57d5946e40cf8cbf7c7.tar.gz |
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/test/ndbapi/testIndex.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge
Diffstat (limited to 'ndb/test/src')
0 files changed, 0 insertions, 0 deletions