summaryrefslogtreecommitdiff
path: root/sql/item_row.cc
diff options
context:
space:
mode:
authorunknown <bell@laptop.sanja.is.com.ua>2003-10-06 22:35:05 +0300
committerunknown <bell@laptop.sanja.is.com.ua>2003-10-06 22:35:05 +0300
commitbd3beb83830f36d0692361bf987e0e5d97bed74b (patch)
treea4cf6b026a7c82e8f8e8457dbd0a7d16a2fd645b /sql/item_row.cc
parent9f7674c8946997fcdbc93531697a69c5b1a645be (diff)
downloadmariadb-git-bd3beb83830f36d0692361bf987e0e5d97bed74b.tar.gz
fixed error names
mysql-test/r/row.result: fixed error message as it was suggested by Peter Gulutzan mysql-test/r/subselect.result: fixed error message as it was suggested by Peter Gulutzan sql/share/czech/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/danish/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/dutch/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/english/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/estonian/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/french/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/german/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/greek/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/hungarian/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/italian/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/japanese/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/korean/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/norwegian-ny/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/norwegian/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/polish/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/portuguese/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/romanian/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/russian/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/serbian/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/slovak/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/spanish/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/swedish/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan sql/share/ukrainian/errmsg.txt: fixed error message as it was suggested by Peter Gulutzan
Diffstat (limited to 'sql/item_row.cc')
-rw-r--r--sql/item_row.cc4
1 files changed, 2 insertions, 2 deletions
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;