Commit 1015e182 authored by unknown's avatar unknown
Browse files

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

into  fedora.(none):/home/reggie/bk/mysql-5.0
parents d67bd210 6eb7a80a

mysql-test/r/delayed.result

+7 −0
Original line number Diff line number Diff line
@@ -32,3 +32,10 @@ a b 
3	d

4	e

drop table t1;

create table t1 (a int not null primary key);

insert into t1 values (1);

insert delayed into t1 values (1);

select * from t1;

a

1

drop table t1;

mysql-test/r/func_math.result

+13 −0
Original line number Diff line number Diff line
@@ -152,3 +152,16 @@ ceil(0.09) 
select ceil(0.000000000000000009);

ceil(0.000000000000000009)

1

create table t1 select round(1, 6);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `round(1, 6)` decimal(7,6) NOT NULL default '0.000000'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

select * from t1;

round(1, 6)

1.000000

drop table t1;

select abs(-2) * -2;

abs(-2) * -2

-4

mysql-test/r/key_cache.result

+3 −3
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ SELECT @@global.default.key_buffer_size; 
@@global.default.key_buffer_size

16777216

SELECT @@global.default.`key_buffer_size`;

@@global.default.key_buffer_size

@@global.default.`key_buffer_size`

16777216

SELECT @@global.`default`.`key_buffer_size`;

@@global.default.key_buffer_size

@@global.`default`.`key_buffer_size`

16777216

SELECT @@`default`.key_buffer_size;

@@default.key_buffer_size

@@`default`.key_buffer_size

16777216

SELECT @@small.key_buffer_size;

@@small.key_buffer_size

mysql-test/r/ps_1general.result

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ execute stmt1 ; 
ERROR 42S02: Unknown table 't5'

prepare stmt1 from ' SELECT @@version ' ;

execute stmt1 ;

@@VERSION

@@version

<version>

prepare stmt_do from ' do @var:=  (1 in (select a from t1)) ' ;

prepare stmt_set from ' set @var= (1 in (select a from t1)) ' ;

mysql-test/r/rpl_slave_status.result

0 → 100644
+54 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

grant replication slave on *.* to rpl@127.0.0.1 identified by 'rpl';

stop slave;

change master to master_user='rpl',master_password='rpl';

start slave;

drop table if exists t1;

create table t1 (n int);

insert into t1 values (1);

select * from t1;

n

1

delete from mysql.user where user='rpl';

flush privileges;

stop slave;

start slave;

show slave status;

Slave_IO_State	Connecting to master

Master_Host	127.0.0.1

Master_User	rpl

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	357

Relay_Log_File	slave-relay-bin.000001

Relay_Log_Pos	401

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	No

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	357

Relay_Log_Space	401

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	NULL