diff options
Diffstat (limited to 'sql')
28 files changed, 37 insertions, 37 deletions
diff --git a/sql/item.cc b/sql/item.cc index 9d34f299a07..55df169965e 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -108,7 +108,7 @@ bool Item::check_cols(uint c) { if (c != 1) { - my_error(ER_CARDINALITY_COL, MYF(0), c); + my_error(ER_OPERAND_COLUMNS, MYF(0), c); return 1; } return 0; @@ -1784,7 +1784,7 @@ void Item_cache_row::illegal_method_call(const char *method) DBUG_ENTER("Item_cache_row::illegal_method_call"); DBUG_PRINT("error", ("!!! %s method was called for row item", method)); DBUG_ASSERT(0); - my_error(ER_CARDINALITY_COL, MYF(0), 1); + my_error(ER_OPERAND_COLUMNS, MYF(0), 1); DBUG_VOID_RETURN; } @@ -1792,7 +1792,7 @@ bool Item_cache_row::check_cols(uint c) { if (c != item_count) { - my_error(ER_CARDINALITY_COL, MYF(0), c); + my_error(ER_OPERAND_COLUMNS, MYF(0), c); return 1; } return 0; diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index e7dc3933c10..3472f29850e 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -229,7 +229,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; } @@ -239,7 +239,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)); @@ -423,7 +423,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) @@ -1351,7 +1351,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; @@ -1378,7 +1378,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; diff --git a/sql/item_row.cc b/sql/item_row.cc index 43e38763aa6..fcc6e5192ec 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -49,7 +49,7 @@ void Item_row::illegal_method_call(const char *method) DBUG_ENTER("Item_row::illegal_method_call"); DBUG_PRINT("error", ("!!! %s method was called for row item", method)); DBUG_ASSERT(0); - my_error(ER_CARDINALITY_COL, MYF(0), 1); + my_error(ER_OPERAND_COLUMNS, MYF(0), 1); DBUG_VOID_RETURN; } @@ -112,7 +112,7 @@ bool Item_row::check_cols(uint c) { if (c != arg_count) { - my_error(ER_CARDINALITY_COL, MYF(0), c); + my_error(ER_OPERAND_COLUMNS, MYF(0), c); return 1; } return 0; diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 7c4fe8621a7..3daa7be6f43 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -105,7 +105,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(); @@ -262,7 +262,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; @@ -527,7 +527,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); } diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index 5a3976822e5..29d8b255251 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -252,7 +252,7 @@ character-set=latin2 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index 6f43e3eb7f1..d603555727b 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -246,7 +246,7 @@ character-set=latin1 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index d372e1c9ff6..53a19464745 100644 --- a/sql/share/dutch/errmsg.txt +++ b/sql/share/dutch/errmsg.txt @@ -254,7 +254,7 @@ character-set=latin1 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 9506e672a05..c54f56b2529 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -243,7 +243,7 @@ character-set=latin1 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 8fbf084320e..2997a4d4501 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -248,7 +248,7 @@ character-set=latin7 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index 3eeecce6c33..cd346270ea8 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -243,7 +243,7 @@ character-set=latin1 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index ebedaad6e94..4fd38fdb6da 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -252,7 +252,7 @@ character-set=latin1 "Slave SQL thread ignored the query because of replicate-*-table rules", "Falsche Foreign-Key Definition für '%-64s': %s", "Schlüssel- und Tabellenreferenz passen nicht zueinander.", -"Kardinalitäts-Fehler (mehr/oder weniger als %d Spalten).", +"Operand should contain %d column(s)", "Unterabfrage lieferte mehr als einen Datensatz zurück.", "Unbekannter prepared statement handler (%ld) für %s angegeben.", "Die Hilfedatenbank ist beschädigt oder existiert nicht.", diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index dfcd8710a15..31259e9e02f 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -243,7 +243,7 @@ character-set=greek "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index 71877f252f9..52dfb702231 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -245,7 +245,7 @@ character-set=latin2 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index 501630aa3ef..7efca542348 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -243,7 +243,7 @@ character-set=latin1 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 4a066e2e13f..f7d6d7be29b 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -245,7 +245,7 @@ character-set=ujis "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index 333da3967dc..654081c6895 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -243,7 +243,7 @@ character-set=euckr "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index 7899ac2862b..76f725a9419 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -245,7 +245,7 @@ character-set=latin1 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index 171d5eb7b3a..fe15f7c9b8b 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -245,7 +245,7 @@ character-set=latin1 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index 3e1a101b9d1..12e1d539e76 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -247,7 +247,7 @@ character-set=latin2 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index af4e210a5b7..49ca7ee5c56 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -244,7 +244,7 @@ character-set=latin1 "Slave SQL thread ignorado a consulta devido às normas de replicação-*-tabela" "Definição errada da chave estrangeira para '%-.64s': %s", "Referência da chave e referência da tabela não coincidem", -"Error de cardinalidade (mais/menos que %d colunas)", +"Operand should contain %d column(s)", "Subconsulta retorna mais que 1 registro", "Desconhecido manipulador de declaração preparado (%ld) determinado para %s", "Banco de dado de ajuda corrupto ou não existente", diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index 0dffb09e9f7..30e87fe3d0a 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -247,7 +247,7 @@ character-set=latin2 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index 389cb581717..b444348612f 100644 --- a/sql/share/russian/errmsg.txt +++ b/sql/share/russian/errmsg.txt @@ -245,7 +245,7 @@ character-set=koi8r "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"ïÛÉÂËÁ ÍÏÝØÎÏÓÔÉ ÍÎÏÖÅÓÔ×Á (ÂÏÌØÛÅ/ÍÅÎØÛÅ %d ËÏÌÏÎÏË)", +"ïÐÅÒÁÎÄ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ %d ËÏÌÏÎÏË", "ðÏÄÚÁÐÒÏÓ ×ÏÚ×ÒÁÝÁÅÔ ÂÏÌÅÅ ÏÄÎÏÊ ÚÁÐÉÓÉ", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt index 0f461a9e718..32b94548bc5 100644 --- a/sql/share/serbian/errmsg.txt +++ b/sql/share/serbian/errmsg.txt @@ -238,7 +238,7 @@ character-set=cp1250 "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index dc07eb0a54e..45e40caedee 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -251,7 +251,7 @@ character-set=latin2 "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index a1b36887282..bce03456941 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -245,7 +245,7 @@ character-set=latin1 "Slave SQL thread ignorado el query debido a las reglas de replicación-*-tabla" "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (more/less than %d columns)", +"Operand should contain %d column(s)", "Subquery returns more than 1 row", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index e0d0bea47d2..827419d76e7 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -243,7 +243,7 @@ character-set=latin1 "Slav SQL tråden ignorerade frågan pga en replicate-*-table regel", "Felaktig FOREIGN KEY-definition för '%-.64s': %s", "Nyckelreferensen och tabellreferensen stämmer inte överens", -"Kardinalitetsfel (fler/färre än %d kolumner)", +"Operand should contain %d column(s)", "Subquery returnerade mer än 1 rad", "Okänd PREPARED STATEMENT id (%ld) var given till %s", "Hjälpdatabasen finns inte eller är skadad", diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt index a2133049741..fcf0c695c29 100644 --- a/sql/share/ukrainian/errmsg.txt +++ b/sql/share/ukrainian/errmsg.txt @@ -248,7 +248,7 @@ character-set=koi8u "Slave SQL thread ignored the query because of replicate-*-table rules", "Wrong foreign key definition for '%-.64s': %s", "Key reference and table reference doesn't match", -"Cardinality error (¦ÌØÛÅ/ÍÅÎØÛÅ Î¦Ö %d ÓÔÏ×Âæ×)", +"ïÐÅÒÁÎÄ ÍÁ¤ ÓËÌÁÄÁÔÉÓÑ Ú %d ÓÔÏ×Âæ×", "ð¦ÄÚÁÐÉÔ ÐÏ×ÅÒÔÁ¤ ¦ÌØÛ ÎiÖ 1 ÚÁÐÉÓ", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", diff --git a/sql/sql_class.cc b/sql/sql_class.cc index de2da5a379b..968de304d67 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1023,7 +1023,7 @@ bool select_singlerow_subselect::send_data(List<Item> &items) Item_singlerow_subselect *it= (Item_singlerow_subselect *)item; if (it->assigned()) { - my_message(ER_SUBSELECT_NO_1_ROW, ER(ER_SUBSELECT_NO_1_ROW), MYF(0)); + my_message(ER_SUBQUERY_NO_1_ROW, ER(ER_SUBQUERY_NO_1_ROW), MYF(0)); DBUG_RETURN(1); } if (unit->offset_limit_cnt) |