diff --git a/sql/sql_base.cc b/sql/sql_base.cc index fd6c2c48020..be630fd375c 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1078,7 +1078,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name, table->status=STATUS_NO_RECORD; table->keys_in_use_for_query= table->keys_in_use; 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); } diff --git a/sql/sql_class.cc b/sql/sql_class.cc index e6acab6a244..ebea620ffa1 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -882,7 +882,8 @@ bool select_singleval_subselect::send_data(List &items) DBUG_ENTER("select_singleval_subselect::send_data"); Item_singleval_subselect *it= (Item_singleval_subselect *)item; 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); } if (unit->offset_limit_cnt)