summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.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_innodb.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_innodb.cc')
-rw-r--r--sql/ha_innodb.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 3f592e36219..4d334c24107 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -1863,17 +1863,20 @@ ha_innobase::get_row_type() const
/********************************************************************
Gives the file extension of an InnoDB single-table tablespace. */
+static const char* ha_innobase_exts[] = {
+ ".ibd",
+ NullS
+};
const char**
ha_innobase::bas_ext() const
/*========================*/
/* out: file extension string */
{
- static const char* ext[] = {".ibd", NullS};
-
- return(ext);
+ return ha_innobase_exts;
}
+
/*********************************************************************
Normalizes a table name string. A normalized name consists of the
database name catenated to '/' and table name. An example: