diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-05-28 16:03:07 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-05-28 16:03:07 +0200 |
| commit | ac146e31c7f1e60f5ad01a39583cad5a655c4ebb (patch) | |
| tree | de9c7bb8e65264bfc8b02fb4227559c03ca2eb68 /sql/unireg.cc | |
| parent | dab8586f27cf2f509f6dcc4c8121572653e2233d (diff) | |
| parent | 547b51124c580e0d5fbfd519a93e38f2364f729c (diff) | |
| download | mariadb-git-ac146e31c7f1e60f5ad01a39583cad5a655c4ebb.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
manual merge
ndb/test/ndbapi/testNodeRestart.cpp:
manual merge
Diffstat (limited to 'sql/unireg.cc')
0 files changed, 0 insertions, 0 deletions