diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-07-25 20:53:49 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-07-25 20:53:49 +0400 |
| commit | 2b0f6ece7bd35399de861f1dd5d1ae540ee89ff6 (patch) | |
| tree | 1e9216bd7901c2a09b12488bec3f6dae77416b78 /sql/sql_parse.cc | |
| parent | 0b79fe2b30e7a82a823e7c134eb69cfc0c078f95 (diff) | |
| parent | 55597a48698b267b966873727b079cd3ac0d1c18 (diff) | |
| download | mariadb-git-2b0f6ece7bd35399de861f1dd5d1ae540ee89ff6.tar.gz | |
Merge 5.5-main -> 5.5-show-explain
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2bdc7952d73..73dbe328761 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2075,6 +2075,11 @@ mysql_execute_command(THD *thd) } DBUG_RETURN(0); } + /* + Execute deferred events first + */ + if (slave_execute_deferred_events(thd)) + DBUG_RETURN(-1); } else { @@ -2712,7 +2717,7 @@ end_with_restore_list: goto error; #else { - if (check_global_access(thd, SUPER_ACL)) + if (check_global_access(thd, SUPER_ACL | REPL_CLIENT_ACL)) goto error; res = show_binlogs(thd); break; @@ -6219,6 +6224,7 @@ TABLE_LIST *st_select_lex::end_nested_join(THD *thd) embedded->embedding= embedding; join_list->push_front(embedded); ptr= embedded; + embedded->lifted= 1; } else if (nested_join->join_list.elements == 0) { |