Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb

1 files changed, 6 insertions, 1 deletions

diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index f0903d3a233..4f0db20d0b0 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -772,6 +772,12 @@ static void set_tabname(const char *pathname, char *tabname);
   void cond_pop();
 
   uint8 table_cache_type();
+
+  /*
+   * Internal to ha_ndbcluster, used by C functions
+   */
+  int ndb_err(NdbTransaction*);
+
   my_bool register_query_cache_table(THD *thd, char *table_key,
                                      uint key_length,
                                      qc_engine_callback *engine_callback,
@@ -868,7 +874,6 @@ private:
                                   ulonglong nb_desired_values,
                                   ulonglong *first_value,
                                   ulonglong *nb_reserved_values);
-  int ndb_err(NdbTransaction*);
   bool uses_blob_value();
 
   char *update_table_comment(const char * comment);