database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.

Browse Source
This commit is contained in:
Jan Lindström
2014-04-16 12:13:43 +03:00
parent 983366e0ee 142c20eda9
commit 150e88e8c9
2006 changed files with 137005 additions and 122130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_class.cc
View File

@@ -1349,7 +1349,6 @@ MYSQL_ERROR* THD::raise_condition(uint sql_errno,
got_warning= 1;
break;
case MYSQL_ERROR::WARN_LEVEL_ERROR:
mysql_audit_general(this, MYSQL_AUDIT_GENERAL_ERROR, sql_errno, msg);
break;
default:
DBUG_ASSERT(FALSE);
@@ -1360,6 +1359,8 @@ MYSQL_ERROR* THD::raise_condition(uint sql_errno,
if (level == MYSQL_ERROR::WARN_LEVEL_ERROR)
{
mysql_audit_general(this, MYSQL_AUDIT_GENERAL_ERROR, sql_errno, msg);
is_slave_error= 1; // needed to catch query errors during replication
if (! stmt_da->is_error())
@@ -1581,9 +1582,7 @@ void THD::init_for_queries()
void THD::change_user(void)
{
mysql_mutex_lock(&LOCK_status);
add_to_status(&global_status_var, &status_var);
mysql_mutex_unlock(&LOCK_status);
add_status_to_global();
cleanup();
reset_killed();
@@ -1614,6 +1613,7 @@ void THD::cleanup(void)
#endif
mysql_ha_cleanup(this);
locked_tables_list.unlock_locked_tables(this);
close_temporary_tables(this);
@@ -1621,8 +1621,6 @@ void THD::cleanup(void)
trans_rollback(this);
xid_cache_delete(&transaction.xid_state);
locked_tables_list.unlock_locked_tables(this);
DBUG_ASSERT(open_tables == NULL);
/*
If the thread was in the middle of an ongoing transaction (rolled