diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 18:47:47 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 18:47:47 +0200 |
| commit | 821db3801d443f5b7640921da9a6d15496649803 (patch) | |
| tree | 025c1d642dceb92c4ed7a235065641ba01d97d5b /sql/sql_base.cc | |
| parent | a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254 (diff) | |
| download | mariadb-git-821db3801d443f5b7640921da9a6d15496649803.tar.gz | |
remove numerous #ifdef HAVE_PSI_TABLE_INTERFACE
simplify ha_table_share_psi()
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 004fbb24294..7fe9429d664 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -640,11 +640,7 @@ TABLE_SHARE *get_table_share(THD *thd, const char *db, const char *table_name, goto err; } -#ifdef HAVE_PSI_TABLE_INTERFACE - share->m_psi= PSI_CALL(get_table_share)(false, share); -#else - share->m_psi= NULL; -#endif + share->m_psi= PSI_CALL_get_table_share(false, share); DBUG_PRINT("exit", ("share: 0x%lx ref_count: %u", (ulong) share, share->ref_count)); @@ -6007,11 +6003,7 @@ TABLE *open_table_uncached(THD *thd, handlerton *hton, DBUG_RETURN(0); } -#ifdef HAVE_PSI_TABLE_INTERFACE - share->m_psi= PSI_CALL(get_table_share)(true, share); -#else - share->m_psi= NULL; -#endif + share->m_psi= PSI_CALL_get_table_share(true, share); if (open_table_from_share(thd, share, table_name, (uint) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE | |