diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-06 18:13:06 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-03-06 18:13:06 +0100 |
| commit | 17a37796e1947e2227824416d297a746a1dc6c26 (patch) | |
| tree | 8119b6add58854dec70b3fdc0ce2404ff0421ce8 | |
| parent | d7d19071d27488cf59fd7b6fb7bd23d467a9ac6e (diff) | |
| download | mariadb-git-17a37796e1947e2227824416d297a746a1dc6c26.tar.gz | |
after innodb/xtradb merge: use the correct visibility for internal functions
otherwise innodb plugin might invoke xtradb function with the same name,
and that might crash (./mtr --emb innodb.strict_mode)
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 95dfc9dfc5a..a7854af7014 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -12262,7 +12262,7 @@ innobase_convert_to_filename_charset( /********************************************************************** Issue a warning that the row is too big. */ -extern "C" +extern "C" UNIV_INTERN void ib_warn_row_too_big(const dict_table_t* table) { diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 2fd56013139..2fccd4e63b8 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -13988,7 +13988,7 @@ innobase_convert_to_filename_charset( /********************************************************************** Issue a warning that the row is too big. */ -extern "C" +extern "C" UNIV_INTERN void ib_warn_row_too_big(const dict_table_t* table) { |