1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for message being sent in EXPLAIN ...

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2002-11-18 20:58:04 +02:00
parent b9a671f267
commit 4cec1660da
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.cc
View File

@ -1078,7 +1078,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
table->status=STATUS_NO_RECORD; table->status=STATUS_NO_RECORD;
table->keys_in_use_for_query= table->keys_in_use; table->keys_in_use_for_query= table->keys_in_use;
table->used_keys= table->keys_for_keyread; table->used_keys= table->keys_for_keyread;
DBUG_ASSERT(table->key_read == 0); // DBUG_ASSERT(table->key_read == 0); put in comment as this fails on EXPLAIN
DBUG_RETURN(table); DBUG_RETURN(table);
} }

3
sql/sql_class.cc
View File

@ -882,7 +882,8 @@ bool select_singleval_subselect::send_data(List<Item> &items)
DBUG_ENTER("select_singleval_subselect::send_data"); DBUG_ENTER("select_singleval_subselect::send_data");
Item_singleval_subselect *it= (Item_singleval_subselect *)item; Item_singleval_subselect *it= (Item_singleval_subselect *)item;
if (it->assigned()){ if (it->assigned()){
my_message(ER_SUBSELECT_NO_1_ROW, ER(ER_SUBSELECT_NO_1_ROW), MYF(0)); if (!current_thd->lex.describe)
my_message(ER_SUBSELECT_NO_1_ROW, ER(ER_SUBSELECT_NO_1_ROW), MYF(0));
DBUG_RETURN(1); DBUG_RETURN(1);
} }
if (unit->offset_limit_cnt) if (unit->offset_limit_cnt)