diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-21 13:55:26 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-21 13:55:26 +0200 |
| commit | 8a3d3a539fa3aa2967c76c3eb59033a13524aeed (patch) | |
| tree | 9e72427611ac5057a8bf3051e0bd43678e33a8a2 /sql/sql_select.cc | |
| parent | 3ffd7865b02a37569f955e40505f2f6b46cbe7a0 (diff) | |
| download | mariadb-git-8a3d3a539fa3aa2967c76c3eb59033a13524aeed.tar.gz | |
fixed test of cardinality
mysql-test/r/subselect.result:
test of cardinality error
mysql-test/t/subselect.test:
test of cardinality error
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5912f3021dc..3d8d63b43ed 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -271,8 +271,8 @@ JOIN::prepare(TABLE_LIST *tables_init, thd->where="having clause"; thd->allow_sum_func=1; select_lex->having_fix_field= 1; - bool having_fix_rc= (having->check_cols(1) || - having->fix_fields(thd, tables_list, &having)); + bool having_fix_rc= (having->fix_fields(thd, tables_list, &having) || + having->check_cols(1)); select_lex->having_fix_field= 0; if (having_fix_rc || thd->net.report_error) DBUG_RETURN(-1); /* purecov: inspected */ @@ -6912,7 +6912,7 @@ find_order_in_list(THD *thd,TABLE_LIST *tables,ORDER *order,List<Item> &fields, } order->in_field_list=0; Item *it= *order->item; - if (it->check_cols(1) || it->fix_fields(thd, tables, order->item) || + if (it->fix_fields(thd, tables, order->item) || it->check_cols(1) || thd->fatal_error) return 1; // Wrong field all_fields.push_front(*order->item); // Add new field to field list |