diff options
| author | unknown <bell@laptop.sanja.is.com.ua> | 2003-10-07 01:31:16 +0300 |
|---|---|---|
| committer | unknown <bell@laptop.sanja.is.com.ua> | 2003-10-07 01:31:16 +0300 |
| commit | 00594481528476b49ef81bb637582525ff5d56f7 (patch) | |
| tree | ccb24bcca2f18fcd1ceb62cf71844bbdb2917582 /sql/item_cmpfunc.cc | |
| parent | 7df32ac6d508d57f3aedfa37c3031835cc44628b (diff) | |
| parent | 104da10b4d4f5d47c655eb17e8551dafdb5d6bd3 (diff) | |
| download | mariadb-git-00594481528476b49ef81bb637582525ff5d56f7.tar.gz | |
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
mysql-test/r/subselect.result:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 37a644256f4..4e6301d2626 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -245,7 +245,7 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type) uint n= (*a)->cols(); if (n != (*b)->cols()) { - my_error(ER_CARDINALITY_COL, MYF(0), n); + my_error(ER_OPERAND_COLUMNS, MYF(0), n); comparators= 0; return 1; } @@ -255,7 +255,7 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type) { if ((*a)->el(i)->cols() != (*b)->el(i)->cols()) { - my_error(ER_CARDINALITY_COL, MYF(0), (*a)->el(i)->cols()); + my_error(ER_OPERAND_COLUMNS, MYF(0), (*a)->el(i)->cols()); return 1; } comparators[i].set_cmp_func(owner, (*a)->addr(i), (*b)->addr(i)); @@ -439,7 +439,7 @@ bool Item_in_optimizer::fix_fields(THD *thd, struct st_table_list *tables, Item_in_subselect * sub= (Item_in_subselect *)args[1]; if (args[0]->cols() != sub->engine->cols()) { - my_error(ER_CARDINALITY_COL, MYF(0), args[0]->cols()); + my_error(ER_OPERAND_COLUMNS, MYF(0), args[0]->cols()); return 1; } if (args[1]->maybe_null) @@ -1367,7 +1367,7 @@ void cmp_item_row::store_value_by_template(cmp_item *t, Item *item) cmp_item_row *tmpl= (cmp_item_row*) t; if (tmpl->n != item->cols()) { - my_error(ER_CARDINALITY_COL, MYF(0), tmpl->n); + my_error(ER_OPERAND_COLUMNS, MYF(0), tmpl->n); return; } n= tmpl->n; @@ -1394,7 +1394,7 @@ int cmp_item_row::cmp(Item *arg) arg->null_value= 0; if (arg->cols() != n) { - my_error(ER_CARDINALITY_COL, MYF(0), n); + my_error(ER_OPERAND_COLUMNS, MYF(0), n); return 1; } bool was_null= 0; |