summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-04-27 11:25:08 +0200
committermsvensson@neptunus.(none) <>2005-04-27 11:25:08 +0200
commitc12ee8dc1676ab898c0d066fb6a59b1574465f62 (patch)
treeffe13a13497b747762b2e275e63a444e442611a6 /sql/ha_myisammrg.cc
parentea9cbd3bb4bbcf08d193c6008fd93f4b8f7f7ff8 (diff)
downloadmariadb-git-c12ee8dc1676ab898c0d066fb6a59b1574465f62.tar.gz
BUG#9714 libsupc++ problem
- Remove linking of libsupc++ - Move all local static variables to filescope
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)
{