Commit fd15d5ae authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.0/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.0
parents c56697f0 86ae07cd

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ MY_TZ=GMT-3 
TZ=$MY_TZ; export TZ # for UNIX_TIMESTAMP tests to work



# For query_cache test

case "$SYSTEM" in

case `uname` in

    SCO_SV | UnixWare | OpenUNIX )

        # do nothing (Causes strange behavior)

        ;;

mysql-test/r/func_math.result

+0 −9
Original line number Diff line number Diff line
@@ -59,12 +59,3 @@ ASIN(0.8+0.2) 
SELECT ASIN(1.2-0.2);

ASIN(1.2-0.2)

1.570796
 
select floor(log(4)/log(2));

floor(log(4)/log(2))

2

select floor(log(8)/log(2));

floor(log(8)/log(2))

3

select floor(log(16)/log(2));

floor(log(16)/log(2))

4

mysql-test/r/rpl_error_ignored_table.result

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ select (@id := id) - id from t3; 
0

kill @id;

drop table t2,t3;

Server shutdown in progress

Got one of the listed errors

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.001	79	Query	1	79	use `test`; create table t1 (a int primary key)

mysql-test/t/func_math.test

+4 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ SELECT ASIN(1.2-0.2); 
# Bug #3051 FLOOR returns invalid 

#



select floor(log(4)/log(2));

select floor(log(8)/log(2));

select floor(log(16)/log(2));
 
# This can't be tested as it's not portable

#select floor(log(4)/log(2));

#select floor(log(8)/log(2));

#select floor(log(16)/log(2));

mysql-test/t/rpl_error_ignored_table.test

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ select (@id := id) - id from t3; 
kill @id;

drop table t2,t3;

connection master;

--error 1053;

--error 1053,0;

reap;

connection master1;

show binlog events from 79;