diff options
author | unknown <mskold@mysql.com> | 2006-02-21 13:54:58 +0100 |
---|---|---|
committer | unknown <mskold@mysql.com> | 2006-02-21 13:54:58 +0100 |
commit | dc86ad6dc40caed695cd1f4d8df5dc90e7fe65ee (patch) | |
tree | 420160b798c4ef2f74aded7cd1a2b36350dd8e0d /sql/ha_ndbcluster_binlog.h | |
parent | c1473ba882f6396c2f07779ac6392c8d6068ceae (diff) | |
parent | 12e660e8df1ab293cd1031281e5a84f914f57629 (diff) | |
download | mariadb-git-dc86ad6dc40caed695cd1f4d8df5dc90e7fe65ee.tar.gz |
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Merge
Diffstat (limited to 'sql/ha_ndbcluster_binlog.h')
-rw-r--r-- | sql/ha_ndbcluster_binlog.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster_binlog.h b/sql/ha_ndbcluster_binlog.h index d222a7d848b..d9c8812b3b6 100644 --- a/sql/ha_ndbcluster_binlog.h +++ b/sql/ha_ndbcluster_binlog.h @@ -123,6 +123,8 @@ ndbcluster_show_status_binlog(THD* thd, stat_print_fn *stat_print, prototypes for ndb handler utility function also needed by the ndb binlog code */ +int cmp_frm(const NDBTAB *ndbtab, const void *pack_data, + uint pack_length); int ndbcluster_find_all_files(THD *thd); #endif /* HAVE_NDB_BINLOG */ |