diff options
| author | Andrei Elkin <andrei.elkin@oracle.com> | 2012-04-21 13:24:39 +0300 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@oracle.com> | 2012-04-21 13:24:39 +0300 |
| commit | bf66e3ab637b95b87a0cf9bd580dc58e8f14a1f2 (patch) | |
| tree | 5f529072426678936974bb7abecd548dc5af7004 /sql/sql_parse.cc | |
| parent | e748999eb5e0922bff7d0cb71d2d60dc4a4d783a (diff) | |
| parent | f3509d1d67281af248988e117027c67667dae65c (diff) | |
| download | mariadb-git-bf66e3ab637b95b87a0cf9bd580dc58e8f14a1f2.tar.gz | |
merge bug11754117-45670 fixes from 5.1.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 18f24deba79..3e5dfa43d41 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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 { |