summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-03-23 20:38:42 +0100
committerunknown <serg@serg.mylan>2005-03-23 20:38:42 +0100
commit58aeecb078023ea64c40d8fe2af74a756b759ea2 (patch)
treeb41a8837ee6f7cc8de7d72fc63ae193176b082de /sql/sql_union.cc
parentc4ab5d61fb7af3275f7784257561a644fb2449ee (diff)
downloadmariadb-git-58aeecb078023ea64c40d8fe2af74a756b759ea2.tar.gz
client/mysqltest.c
corrected number of fields for --enable_metadata sql/sql_union.cc fixed a apparent typo in assert client/mysqltest.c: corrected number of fields for --enable_metadata mysql-test/r/metadata.result: corrected number of fields for --enable_metadata mysql-test/r/ps_1general.result: corrected number of fields for --enable_metadata mysql-test/r/ps_2myisam.result: corrected number of fields for --enable_metadata mysql-test/r/ps_3innodb.result: corrected number of fields for --enable_metadata mysql-test/r/ps_4heap.result: corrected number of fields for --enable_metadata mysql-test/r/ps_5merge.result: corrected number of fields for --enable_metadata mysql-test/r/type_enum.result: corrected number of fields for --enable_metadata sql/sql_union.cc: fixed a apparent typo in assert
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 5fd59500ace..793b6e57b6e 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -414,7 +414,7 @@ int 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(1);
+ DBUG_ASSERT(0);
}
for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
{