summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-04-27 11:25:08 +0200
committerunknown <msvensson@neptunus.(none)>2005-04-27 11:25:08 +0200
commit072fa90d9e7f5ac4df1fb42054b906b872497113 (patch)
treeffe13a13497b747762b2e275e63a444e442611a6 /sql/ha_myisammrg.cc
parent9e7028c8e0708877fa802a1b589f695d78ccd1ea (diff)
downloadmariadb-git-072fa90d9e7f5ac4df1fb42054b906b872497113.tar.gz
BUG#9714 libsupc++ problem
- Remove linking of libsupc++ - Move all local static variables to filescope configure.in: Remove linking with libsupc++ sql/examples/ha_archive.cc: Move local static variables to file scope sql/examples/ha_example.cc: Move local static variables to file scope sql/examples/ha_tina.cc: Move local static variables to file scope sql/ha_berkeley.cc: Move local static variables to file scope sql/ha_blackhole.cc: Move local static variables to file scope sql/ha_federated.cc: Move local static variables to file scope sql/ha_heap.cc: Move local static variables to file scope sql/ha_innodb.cc: Move local static variables to file scope sql/ha_myisam.cc: Move local static variables to file scope sql/ha_myisammrg.cc: Move local static variables to file scope sql/ha_ndbcluster.cc: Move local static variables to file scope sql/item.cc: Move local static instance variables to file scope sql/item_sum.cc: Move local static variables to file scope
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r--sql/ha_myisammrg.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 4cd39660728..5add9478bf4 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -32,8 +32,16 @@
** MyISAM MERGE tables
*****************************************************************************/
+static const char *ha_myisammrg_exts[] = {
+ ".MRG",
+ NullS
+};
+
const char **ha_myisammrg::bas_ext() const
-{ static const char *ext[]= { ".MRG", NullS }; return ext; }
+{
+ return ha_myisammrg_exts;
+}
+
const char *ha_myisammrg::index_type(uint key_number)
{