Commit a966b0b7 authored by unknown's avatar unknown
Browse files

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 31fc397c f7414b28

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -3043,6 +3043,7 @@ language = $path_language 
character-sets-dir  = $path_charsetsdir

basedir             = $path_my_basedir

server_id           = $server_id

shutdown-delay      = 10

skip-stack-trace

skip-innodb

skip-ndbcluster

mysql-test/r/func_if.result

+3 −0
Original line number Diff line number Diff line
@@ -128,3 +128,6 @@ f1 f2 if(f1, 40.0, 5.00) 
0	0	5.00

1	1	40.00

drop table t1;

select if(0, 18446744073709551610, 18446744073709551610);

if(0, 18446744073709551610, 18446744073709551610)

18446744073709551610

mysql-test/r/func_misc.result

+44 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/r/im_daemon_life_cycle.result

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ Success: the process was restarted. 
Success: server is ready to accept connection on socket.

SHOW INSTANCE STATUS mysqld1;

instance_name	status	version

mysqld1	online	VERSION

mysqld1	STATE	VERSION

STOP INSTANCE mysqld2;

Success: the process has been stopped.

mysql-test/r/information_schema_db.result

+3 −3
Original line number Diff line number Diff line
@@ -87,13 +87,13 @@ where table_schema='test'; 
table_name	table_type	table_comment

t1	BASE TABLE	

v1	VIEW	VIEW

v2	VIEW	View 'test.v2' references invalid table(s) or column(s) or function(s) or define

v2	VIEW	VIEW

drop table t1;

select table_name, table_type, table_comment from information_schema.tables

where table_schema='test';

table_name	table_type	table_comment

v1	VIEW	View 'test.v1' references invalid table(s) or column(s) or function(s) or define

v2	VIEW	View 'test.v2' references invalid table(s) or column(s) or function(s) or define

v1	VIEW	VIEW

v2	VIEW	VIEW

drop function f1;

drop function f2;

drop view v1, v2;