diff options
| author | unknown <stewart@willster.(none)> | 2006-10-23 23:57:28 +1000 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-10-23 23:57:28 +1000 |
| commit | 399cd9f71651200edc8cc79f6d9d6c3c6be9c94a (patch) | |
| tree | 90bbcca41806eb5b257f773c6bd0c6bc16845ffe /sql/ha_ndbcluster.h | |
| parent | 46152464aa27954659a028d625f82acc601b7bbe (diff) | |
| parent | 8335ed7316e76f056dc763fd68aab9d7ca3fa8d9 (diff) | |
| download | mariadb-git-399cd9f71651200edc8cc79f6d9d6c3c6be9c94a.tar.gz | |
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
sql/sql_select.cc:
Auto merged
sql/ha_ndbcluster.cc:
merge
sql/ha_ndbcluster.h:
merge
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 7d5adcb866b..6bbb0bc0d10 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -583,6 +583,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, @@ -647,8 +653,8 @@ private: ulonglong get_auto_increment(); void invalidate_dictionary_cache(bool global); - int ndb_err(NdbTransaction*); - bool uses_blob_value(bool all_fields); + +bool uses_blob_value(bool all_fields); char *update_table_comment(const char * comment); |