database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

merge bug11754117-45670 fixes from 5.1.

Browse Source
This commit is contained in:
Andrei Elkin
2012-04-21 13:24:39 +03:00
parent e748999eb5 f3509d1d67
commit bf66e3ab63
18 changed files with 406 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_parse.cc
View File

@ -2025,6 +2025,11 @@ mysql_execute_command(THD *thd)
}
DBUG_RETURN(0);
}
/*
Execute deferred events first
*/
if (slave_execute_deferred_events(thd))
DBUG_RETURN(-1);
}
else
{