diff options
| author | unknown <serg@serg.mylan> | 2005-03-26 19:49:24 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-26 19:49:24 +0100 |
| commit | 68717638d572dac02b82511809d3b5f9023c0872 (patch) | |
| tree | 5bb56d7c3d40836dcfebc8a965a7fc7eab54177b /sql | |
| parent | 3fd639493aea5c340acc2e28617e8d917d54ff7d (diff) | |
| parent | b18f2c2a89d3896873a2df20e443a6a0b953cccf (diff) | |
| download | mariadb-git-68717638d572dac02b82511809d3b5f9023c0872.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
acinclude.m4:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_union.cc | 2 |
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()) { |