diff options
author | unknown <mskold/marty@mysql.com/linux.site> | 2006-10-24 08:29:37 +0200 |
---|---|---|
committer | unknown <mskold/marty@mysql.com/linux.site> | 2006-10-24 08:29:37 +0200 |
commit | 2ebf26775f221b496f9b6a0afdd5c8643a4555a4 (patch) | |
tree | b145ddd404b6e2102e7d450cc794479f8f97a56a /sql/ha_ndbcluster.h | |
parent | 7753c52a92079f911915e23fcc26ea58637fc82a (diff) | |
parent | c56a907b32e2c42f0436d5c20b217b5d8419d8a5 (diff) | |
download | mariadb-git-2ebf26775f221b496f9b6a0afdd5c8643a4555a4.tar.gz |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
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 f1a001f2120..d0f7c020184 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -626,6 +626,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, @@ -690,8 +696,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); |