diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-07 00:34:43 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-07 00:34:43 +0300 |
| commit | bae46f1220bc12d8e2922c095172fd8de2e78b02 (patch) | |
| tree | 4f9c8ee3a3d3d04220bfb6e8cae13241b6acc39f /sql/item_subselect.cc | |
| parent | 3f896fd8219b7fc00d0865b214296576b7f9ae29 (diff) | |
| parent | 104da10b4d4f5d47c655eb17e8551dafdb5d6bd3 (diff) | |
| download | mariadb-git-bae46f1220bc12d8e2922c095172fd8de2e78b02.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
sql/item_subselect.cc:
Auto merged
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index cf79ba1fcc1..b7db4aad91e 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -107,7 +107,7 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref) // Is it one field subselect? if (engine->cols() > max_columns) { - my_error(ER_CARDINALITY_COL, MYF(0), 1); + my_error(ER_OPERAND_COLUMNS, MYF(0), 1); return 1; } fix_length_and_dec(); @@ -264,7 +264,7 @@ bool Item_singlerow_subselect::check_cols(uint c) { if (c != engine->cols()) { - my_error(ER_CARDINALITY_COL, MYF(0), c); + my_error(ER_OPERAND_COLUMNS, MYF(0), c); return 1; } return 0; @@ -529,7 +529,7 @@ Item_in_subselect::single_value_transformer(JOIN *join, Item *item; if (select_lex->item_list.elements > 1) { - my_error(ER_CARDINALITY_COL, MYF(0), 1); + my_error(ER_OPERAND_COLUMNS, MYF(0), 1); DBUG_RETURN(RES_ERROR); } |