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

bzr merge -r4209 maria/10.0.

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-05-21 11:09:55 -04:00
parent 558995ad84 1170a54060
commit 086af8367e
2517 changed files with 163371 additions and 128978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@@ -1144,7 +1144,6 @@ THD::THD()
connection_name.length= 0;
bzero(&variables, sizeof(variables));
one_shot_set= 0;
file_id = 0;
query_id= 0;
query_name_consts= 0;
@@ -1450,7 +1449,6 @@ Sql_condition* THD::raise_condition(uint sql_errno,
got_warning= 1;
break;
case Sql_condition::WARN_LEVEL_ERROR:
mysql_audit_general(this, MYSQL_AUDIT_GENERAL_ERROR, sql_errno, msg);
break;
default:
DBUG_ASSERT(FALSE);
@@ -1461,6 +1459,8 @@ Sql_condition* THD::raise_condition(uint sql_errno,
if (level == Sql_condition::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 (!da->is_error())