summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorbell@laptop.sanja.is.com.ua <>2003-10-07 01:31:16 +0300
committerbell@laptop.sanja.is.com.ua <>2003-10-07 01:31:16 +0300
commit18bb43671d2070720637d93789e8f78d90bb6e06 (patch)
treeccb24bcca2f18fcd1ceb62cf71844bbdb2917582 /sql/sql_class.cc
parentccaeb61f8b35d8462a4865294f3189cd45b23654 (diff)
parent0aa70f8115c0b3916619a14196e6bbff64a64fdb (diff)
downloadmariadb-git-18bb43671d2070720637d93789e8f78d90bb6e06.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
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index ed4f2be16ec..6a2e42e9bb1 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)