diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-11-27 22:35:23 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-11-27 22:35:23 +0200 |
| commit | 8b2be4e459eddae70fad7a033bc53213025449f3 (patch) | |
| tree | 298dea0c7a9bbdd40bba1be9f9038a0ffb16ee5e /sql/item_subselect.cc | |
| parent | 6339053d9d04161aebbd3d8f9ebcb9d081c10284 (diff) | |
| download | mariadb-git-8b2be4e459eddae70fad7a033bc53213025449f3.tar.gz | |
after-merge fix
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 1e016da9ec0..ebe916966d6 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -285,7 +285,7 @@ void Item_in_subselect::single_value_transformer(st_select_lex *select_lex, Item *item; if (sl->item_list.elements > 1) { - my_message(ER_SUBSELECT_NO_1_COL, ER(ER_SUBSELECT_NO_1_COL), MYF(0)); + my_error(ER_CARDINALITY_COL, MYF(0), 1); item= 0; // Item_asterisk_remover must fail } else @@ -297,7 +297,7 @@ void Item_in_subselect::single_value_transformer(st_select_lex *select_lex, { sl->item_list.push_back(item); item= (*func)(left_expr, new Item_ref(sl->item_list.head_ref(), - 0, "<result>")); + 0, (char*)"<result>")); if (sl->having) sl->having= new Item_cond_and(sl->having, item); else |