diff options
author | Chad MILLER <chad@mysql.com> | 2008-07-14 16:16:37 -0400 |
---|---|---|
committer | Chad MILLER <chad@mysql.com> | 2008-07-14 16:16:37 -0400 |
commit | a4e7283a9254c09057c92ec20fc145c52bea1d51 (patch) | |
tree | 6009880c2c51b3422d95a760220fb7a20ebdb3e0 /sql/sql_union.cc | |
parent | c425bf421da9ffa55d3d568f70508fa12dd07aa0 (diff) | |
parent | 55ab1ef6951428e0be31956e152537dec670e7df (diff) | |
download | mariadb-git-a4e7283a9254c09057c92ec20fc145c52bea1d51.tar.gz |
Merge from 5.0 trunk.
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 25a0540e4dd..da5e118b069 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -444,7 +444,9 @@ bool st_select_lex_unit::exec() } /* re-enabling indexes for next subselect iteration */ if (union_distinct && table->file->enable_indexes(HA_KEY_SWITCH_ALL)) + { DBUG_ASSERT(0); + } } for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select()) { |