diff options
| author | heikki@hundin.mysql.fi <> | 2004-04-09 22:18:18 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2004-04-09 22:18:18 +0300 |
| commit | 7d3e633edc5db31c0698660ed644d7a18faea41c (patch) | |
| tree | d730f62f831655089c71529d81c5d0d2e5e3d0c7 /sql/ha_innodb.cc | |
| parent | a4a703ba8c4f452da20734c5829f707355eaec79 (diff) | |
| download | mariadb-git-7d3e633edc5db31c0698660ed644d7a18faea41c.tar.gz | |
ha_innodb.cc, sync0sync.h, sync0sync.c:
Use only noninlined InnoDB functions in ha_innodb.cc
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 759679d5bd6..7a651fc12d9 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -15,7 +15,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* This file defines the InnoDB handler: the interface between MySQL and -InnoDB */ +InnoDB +NOTE: You can only use noninlined InnoDB functions in this file, because we +have disables the InnoDB inlining in this file. */ #ifdef __GNUC__ #pragma implementation // gcc: Class implementation @@ -64,6 +66,7 @@ extern "C" { #include "../innobase/include/btr0cur.h" #include "../innobase/include/btr0btr.h" #include "../innobase/include/fsp0fsp.h" +#include "../innobase/include/sync0sync.h" } #define HA_INNOBASE_ROWS_IN_TABLE 10000 /* to get optimization right */ @@ -4629,7 +4632,7 @@ innodb_show_status( long flen; char* str; - mutex_enter(&srv_monitor_file_mutex); + mutex_enter_noninline(&srv_monitor_file_mutex); rewind(srv_monitor_file); srv_printf_innodb_monitor(srv_monitor_file); flen = ftell(srv_monitor_file); @@ -4650,7 +4653,7 @@ innodb_show_status( str[flen] = 0; } - mutex_exit(&srv_monitor_file_mutex); + mutex_exit_noninline(&srv_monitor_file_mutex); List<Item> field_list; |