diff options
| author | unknown <mskold@mysql.com> | 2006-06-12 11:34:00 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-06-12 11:34:00 +0200 |
| commit | 6ac455685f6b8486f77e74f75e4b69a766cf9d80 (patch) | |
| tree | b68b5fe560771ff643f2a98156f207fe519a392f /sql/ha_ndbcluster_binlog.h | |
| parent | 9f9d7e0ae23e47b74b8d635ec0f1f7d1496d06b8 (diff) | |
| parent | 55d554bd1d3a170a8b6d23fec95e1516bb8dc433 (diff) | |
| download | mariadb-git-6ac455685f6b8486f77e74f75e4b69a766cf9d80.tar.gz | |
Merge mysql.com:/home/marty/MySQL/mysql-5.0
into mysql.com:/home/marty/MySQL/mysql-5.1
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
mysql-test/r/ndb_lock.result:
Merge
sql/ha_ndbcluster.cc:
Merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Merge
storage/ndb/src/ndbapi/ndberror.c:
Merge
Diffstat (limited to 'sql/ha_ndbcluster_binlog.h')
0 files changed, 0 insertions, 0 deletions