Commit 739632cb authored by Olivier Bertrand's avatar Olivier Bertrand

Moved PushWarning out of HAVE_PSI_INTERFACE brackets

Modified:
ha_connect.cc
parent 8e1c1949
...@@ -287,6 +287,22 @@ ha_create_table_option connect_field_option_list[]= ...@@ -287,6 +287,22 @@ ha_create_table_option connect_field_option_list[]=
}; };
#endif // MARIADB #endif // MARIADB
/***********************************************************************/
/* Push G->Message as a MySQL warning. */
/***********************************************************************/
bool PushWarning(PGLOBAL g, PTDBASE tdbp)
{
PHC phc;
THD *thd;
MYCAT *cat= (MYCAT*)tdbp->GetDef()->GetCat();
if (!cat || !(phc= cat->GetHandler()) || !phc->GetTable() ||
!(thd= (phc->GetTable())->in_use))
return true;
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, g->Message);
return false;
} // end of PushWarning
/** /**
@brief @brief
...@@ -308,23 +324,6 @@ static PSI_mutex_info all_connect_mutexes[]= ...@@ -308,23 +324,6 @@ static PSI_mutex_info all_connect_mutexes[]=
{ &ex_key_mutex_CONNECT_SHARE_mutex, "CONNECT_SHARE::mutex", 0} { &ex_key_mutex_CONNECT_SHARE_mutex, "CONNECT_SHARE::mutex", 0}
}; };
/***********************************************************************/
/* Push G->Message as a MySQL warning. */
/***********************************************************************/
bool PushWarning(PGLOBAL g, PTDBASE tdbp)
{
PHC phc;
THD *thd;
MYCAT *cat= (MYCAT*)tdbp->GetDef()->GetCat();
if (!cat || !(phc= cat->GetHandler()) || !phc->GetTable() ||
!(thd= (phc->GetTable())->in_use))
return true;
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, g->Message);
return false;
} // end of PushWarning
static void init_connect_psi_keys() static void init_connect_psi_keys()
{ {
const char* category= "connect"; const char* category= "connect";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment