database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime

Browse Source 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-8407_b
This commit is contained in:
malff/marcsql@weblab.(none)
2007-03-06 11:30:08 -07:00
parent f49f21dc09 b216d959bb
commit 9f0b0df961
16 changed files with 689 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sql/sql_class.cc
View File

@ -275,6 +275,38 @@ THD::THD()
substitute_null_with_insert_id = FALSE;
thr_lock_info_init(&lock_info); /* safety: will be reset after start */
thr_lock_owner_init(&main_lock_id, &lock_info);
m_internal_handler= NULL;
}
void THD::push_internal_handler(Internal_error_handler *handler)
{
/*
TODO: The current implementation is limited to 1 handler at a time only.
THD and sp_rcontext need to be modified to use a common handler stack.
*/
DBUG_ASSERT(m_internal_handler == NULL);
m_internal_handler= handler;
}
bool THD::handle_error(uint sql_errno,
MYSQL_ERROR::enum_warning_level level)
{
if (m_internal_handler)
{
return m_internal_handler->handle_error(sql_errno, level, this);
}
return FALSE; // 'FALSE', as per coding style
}
void THD::pop_internal_handler()
{
DBUG_ASSERT(m_internal_handler != NULL);
m_internal_handler= NULL;
}