1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

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
This commit is contained in:
unknown
2005-03-23 20:38:42 +01:00
parent c4ab5d61fb
commit 58aeecb078
9 changed files with 66 additions and 66 deletions

View File

@@ -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())
{