Fixed failed merge

ee0a4499 · mskold@mysql.com · d4c7c4ff · ee0a4499
Commit ee0a4499 authored Feb 01, 2005 by mskold@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sql/ha_ndbcluster.h sql/ha_ndbcluster.h +2 -0

No files found.
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -391,6 +391,8 @@ class ha_ndbcluster: public handler
  int ndb_err(NdbTransaction*);
  bool uses_blob_value(bool all_fields);

+  char *update_table_comment(const char * comment);
+
  int write_ndb_file();

  int check_ndb_connection();