Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index e6fcdde31a6..ab9230e5f01 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -825,10 +825,10 @@ public:
 };
 
 /* Single value subselect interface class */
-class select_singleval_subselect :public select_subselect
+class select_singlerow_subselect :public select_subselect
 {
 public:
-  select_singleval_subselect(Item_subselect *item):select_subselect(item){}
+  select_singlerow_subselect(Item_subselect *item):select_subselect(item){}
   bool send_data(List<Item> &items);
 };