diff options
author | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:30:11 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:30:11 +0200 |
commit | 49b448ae5a91ed9c0dde57ecd1de724bf517d904 (patch) | |
tree | f6690b461077fc5644f43401a24546964f1be90d /sql/ha_ndbcluster.cc | |
parent | 2821fa611b435abea0c7445a73376c400917e87e (diff) | |
parent | 072fa90d9e7f5ac4df1fb42054b906b872497113 (diff) | |
download | mariadb-git-49b448ae5a91ed9c0dde57ecd1de724bf517d904.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/bug9714
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
configure.in:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r-- | sql/ha_ndbcluster.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index e2d954b1928..dbcb8c8fdfd 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3074,10 +3074,15 @@ int ha_ndbcluster::extra_opt(enum ha_extra_function operation, ulong cache_size) DBUG_RETURN(extra(operation)); } +static const char *ha_ndbcluster_exts[] = { + ha_ndb_ext, + NullS +}; const char** ha_ndbcluster::bas_ext() const -{ static const char *ext[]= { ha_ndb_ext, NullS }; return ext; } - +{ + return ha_ndbcluster_exts; +} /* How many seeks it will take to read through the table |