summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.h
diff options
context:
space:
mode:
authorunknown <mskold@mysql.com>2005-04-22 17:38:28 +0200
committerunknown <mskold@mysql.com>2005-04-22 17:38:28 +0200
commitabc3a3609b6749db74e5ca4a6a06f09432c30c05 (patch)
tree99493403c01d2b9aaafe81e6ee7e58c16d8a9445 /sql/ha_ndbcluster.h
parentda43c3cc6d2eaef41ee2c35a5b1a28d0eea80f93 (diff)
parent639d4295c69dbe32076979c0854ac40b42820223 (diff)
downloadmariadb-git-abc3a3609b6749db74e5ca4a6a06f09432c30c05.tar.gz
Merge
sql/ha_ndbcluster.cc: Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.h')
-rw-r--r--sql/ha_ndbcluster.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 4574ddc3562..4dbab18b828 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -457,6 +457,9 @@ class ha_ndbcluster: public handler
static Thd_ndb* seize_thd_ndb();
static void release_thd_ndb(Thd_ndb* thd_ndb);
+static void set_dbname(const char *pathname, char *dbname);
+static void set_tabname(const char *pathname, char *tabname);
+
/*
Condition pushdown
*/
@@ -537,7 +540,6 @@ private:
void set_dbname(const char *pathname);
void set_tabname(const char *pathname);
- void set_tabname(const char *pathname, char *tabname);
bool set_hidden_key(NdbOperation*,
uint fieldnr, const byte* field_ptr);