diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-12-31 01:04:59 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-12-31 01:04:59 +0100 |
| commit | 002d7efa478878565805810dda4bb37bd5dcd32e (patch) | |
| tree | b030e2a97457bcce43d57b586e30ec006bca32d5 /sql/discover.cc | |
| parent | 3099886cda04701283645d1c59d04c7b2e66966c (diff) | |
| parent | 0968cc9dec13ddc3352eeff73aa8ebb3eecb0213 (diff) | |
| download | mariadb-git-002d7efa478878565805810dda4bb37bd5dcd32e.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/main/mysql-5.1
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
storage/ndb/include/kernel/signaldata/Extent.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Auto merged
storage/ndb/src/kernel/blocks/diskpage.hpp:
Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/print_file.cpp:
Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/tsman.hpp:
Auto merged
storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp:
Auto merged
Diffstat (limited to 'sql/discover.cc')
0 files changed, 0 insertions, 0 deletions