diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-03-20 16:26:51 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-03-20 16:26:51 +0100 |
| commit | 4384879603faa6fafaf1ca5ce952c666968c0f6e (patch) | |
| tree | 401411edcfa72bff5a120a8b32e6060b8852ceaf /mysql-test/r/ndb_blob.result | |
| parent | 1dd19f0ca8e17286417ed7627a1c107608d4c801 (diff) | |
| parent | 26afc93a0e4154b797adb0bcb0c85cf7f4f541e1 (diff) | |
| download | mariadb-git-4384879603faa6fafaf1ca5ce952c666968c0f6e.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/src/UtilTransactions.cpp:
Auto merged
Diffstat (limited to 'mysql-test/r/ndb_blob.result')
0 files changed, 0 insertions, 0 deletions