diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-01 11:15:11 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-01 11:15:11 +0200 |
| commit | 20add8c2e8af415e7df9bce75cfa0d1c6cec7d1b (patch) | |
| tree | addcc211471385731872da54c2bf04017ee5aa42 /sql | |
| parent | 5b0c75259c0b62a0a8efc4964fb70816e1d1954e (diff) | |
| parent | a2b5ef8abf33cb3782c8d6c93d933ba4688bcb4f (diff) | |
| download | mariadb-git-20add8c2e8af415e7df9bce75cfa0d1c6cec7d1b.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_berkeley.cc | 3 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index da4d34e6060..54d9865ddd5 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -372,9 +372,8 @@ void berkeley_cleanup_log_files(void) ** Berkeley DB tables *****************************************************************************/ -static const char *ha_bdb_bas_exts[]= { ha_berkeley_ext, NullS }; const char **ha_berkeley::bas_ext() const -{ return ha_bdb_bas_exts; } +{ static const char *ext[]= { ha_berkeley_ext, NullS }; return ext; } ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 8dfc2d82ccc..dd7a719eda4 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3022,12 +3022,8 @@ int ha_ndbcluster::extra_opt(enum ha_extra_function operation, ulong cache_size) } -static const char *ha_ndb_bas_ext[]= { ha_ndb_ext, NullS }; -const char** -ha_ndbcluster::bas_ext() const -{ - return ha_ndb_bas_ext; -} +const char** ha_ndbcluster::bas_ext() const +{ static const char *ext[]= { ha_ndb_ext, NullS }; return ext; } /* |