Commit 57b6c864 authored by unknown's avatar unknown
Browse files

Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
server-tools/instance-manager/instance_options.cc:
  Auto merged
server-tools/instance-manager/mysqlmanager.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 3616b5e3 d9227f15

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -3012,6 +3012,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/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/init_file.result

+7 −0
Original line number Diff line number Diff line 
INSERT INTO init_file.startup VALUES ( NOW() );

SELECT * INTO @X FROM init_file.startup limit 0,1;

SELECT * INTO @Y FROM init_file.startup limit 1,1;

SELECT YEAR(@X)-YEAR(@Y);

YEAR(@X)-YEAR(@Y)

0

DROP DATABASE init_file;

ok

end of 4.1 tests

select * from t1;

mysql-test/r/sp-vars.result

+55 −7
Original line number Diff line number Diff line
@@ -431,17 +431,17 @@ SELECT HEX(v10); 
END|

CALL p1();

HEX(v1)

01

1

HEX(v2)

00

0

HEX(v3)

05

5

HEX(v4)

5555555555555555

HEX(v5)

07

7

HEX(v6)

0000000000000005

5

HEX(v7)

80

HEX(v8)
@@ -748,12 +748,60 @@ HEX(b) b = 0 b = FALSE b IS FALSE b = 1 b = TRUE b IS TRUE 
1	0	0	0	1	1	1

call p2();

HEX(vb)	vb = 0	vb = FALSE	vb IS FALSE	vb = 1	vb = TRUE	vb IS TRUE

00	1	1	1	0	0	0

0	1	1	1	0	0	0

HEX(vb)	vb = 0	vb = FALSE	vb IS FALSE	vb = 1	vb = TRUE	vb IS TRUE

01	0	0	1	1	1	0

1	0	0	0	1	1	1

DROP TABLE t1;

DROP PROCEDURE p1;

DROP PROCEDURE p2;

DROP TABLE IF EXISTS table_12976_a;

DROP TABLE IF EXISTS table_12976_b;

DROP PROCEDURE IF EXISTS proc_12976_a;

DROP PROCEDURE IF EXISTS proc_12976_b;

CREATE TABLE table_12976_a (val bit(1));

CREATE TABLE table_12976_b(

appname varchar(15),

emailperm bit not null default 1,

phoneperm bit not null default 0);

insert into table_12976_b values ('A', b'1', b'1'), ('B', b'0', b'0');

CREATE PROCEDURE proc_12976_a()

BEGIN

declare localvar bit(1);

SELECT val INTO localvar FROM table_12976_a;

SELECT coalesce(localvar, 1)+1, coalesce(val, 1)+1 FROM table_12976_a;

END||

CREATE PROCEDURE proc_12976_b(

name varchar(15),

out ep bit,

out msg varchar(10))

BEGIN

SELECT emailperm into ep FROM table_12976_b where (appname = name);

IF ep is true THEN

SET msg = 'True';

ELSE

SET msg = 'False';

END IF;

END||

INSERT table_12976_a VALUES (0);

call proc_12976_a();

coalesce(localvar, 1)+1	coalesce(val, 1)+1

1	1

UPDATE table_12976_a set val=1;

call proc_12976_a();

coalesce(localvar, 1)+1	coalesce(val, 1)+1

2	2

call proc_12976_b('A', @ep, @msg);

select @ep, @msg;

@ep	@msg

1	True

call proc_12976_b('B', @ep, @msg);

select @ep, @msg;

@ep	@msg

0	False

DROP TABLE table_12976_a;

DROP TABLE table_12976_b;

DROP PROCEDURE proc_12976_a;

DROP PROCEDURE proc_12976_b;



---------------------------------------------------------------

BUG#9572