diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2012-10-06 11:03:37 +0400 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2012-10-06 11:03:37 +0400 |
commit | 30df032e28bada8aabc1c850799795c728cd96b7 (patch) | |
tree | 4d7d8b6e481197bcd1cf04368d7c19316b047527 /sql/sql_union.cc | |
parent | 79feec77ed4a7121e68be1dc16f79dcad6c5d25e (diff) | |
parent | 4d8be2d4f6d7a7b669b7931f1a0ccb5de130fee6 (diff) | |
download | mariadb-git-30df032e28bada8aabc1c850799795c728cd96b7.tar.gz |
SHOW EXPLAIN: merge with 5.5-main
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 8dcae907926..3f8f6436c17 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -722,6 +722,8 @@ bool st_select_lex_unit::exec() } } + DBUG_EXECUTE_IF("show_explain_probe_union_read", + dbug_serve_apcs(thd, 1);); /* Send result to 'result' */ saved_error= TRUE; { |