bk commit into 5.1 tree (malff:1.2448)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-01 19:22:43-07:00, malff@weblab.(none) +2 -0
  Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-26093
  into  weblab.(none):/home/marcsql/TREE/mysql-5.1-26093-merge
  MERGE: 1.1810.2604.1

  mysql-test/r/func_misc.result@stripped, 2007-03-01 19:21:51-07:00, malff@weblab.(none) +0 -0
    Auto merged
    MERGE: 1.21.1.6

  sql/item_func.cc@stripped, 2007-03-01 19:22:38-07:00, malff@weblab.(none) +0 -4
    MERGE: 1.270.42.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-26093-merge/RESYNC

--- 1.30/mysql-test/r/func_misc.result	2007-03-01 19:22:49 -07:00
+++ 1.31/mysql-test/r/func_misc.result	2007-03-01 19:22:49 -07:00
@@ -141,4 +141,48 @@ t1	CREATE TABLE `t1` (
   `a` bigint(21) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+drop table if exists table_26093;
+drop function if exists func_26093_a;
+drop function if exists func_26093_b;
+create table table_26093(a int);
+insert into table_26093 values
+(1), (2), (3), (4), (5),
+(6), (7), (8), (9), (10);
+create function func_26093_a(x int) returns int
+begin
+set @invoked := @invoked + 1;
+return x;
+end//
+create function func_26093_b(x int, y int) returns int
+begin
+set @invoked := @invoked + 1;
+return x;
+end//
+select avg(a) from table_26093;
+avg(a)
+5.5000
+select benchmark(100, (select avg(a) from table_26093));
+benchmark(100, (select avg(a) from table_26093))
+0
+set @invoked := 0;
+select benchmark(100, (select avg(func_26093_a(a)) from table_26093));
+benchmark(100, (select avg(func_26093_a(a)) from table_26093))
+0
+select @invoked;
+@invoked
+10
+set @invoked := 0;
+select benchmark(100, (select avg(func_26093_b(a, rand())) from table_26093));
+benchmark(100, (select avg(func_26093_b(a, rand())) from table_26093))
+0
+select @invoked;
+@invoked
+1000
+select benchmark(100, (select (a) from table_26093));
+ERROR 21000: Subquery returns more than 1 row
+select benchmark(100, (select 1, 1));
+ERROR 21000: Operand should contain 1 column(s)
+drop table table_26093;
+drop function func_26093_a;
+drop function func_26093_b;
 End of 5.0 tests