database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge with 4.0 to get portability fixes

Browse Source
This commit is contained in:
monty@mysql.com
2004-03-19 18:35:49 +02:00
parent b49b24d94a 9a1baf7d62
commit 82c79134b0
5 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.sh
View File

@ -18,7 +18,7 @@ TZ=$MY_TZ; export TZ # for UNIX_TIMESTAMP tests to work
LOCAL_SOCKET=@MYSQL_UNIX_ADDR@ LOCAL_SOCKET=@MYSQL_UNIX_ADDR@
# For query_cache test # For query_cache test
case "$SYSTEM" in case `uname` in
SCO_SV | UnixWare | OpenUNIX ) SCO_SV | UnixWare | OpenUNIX )
# do nothing (Causes strange behavior) # do nothing (Causes strange behavior)
;; ;;

9
mysql-test/r/func_math.result
View File

@ -119,15 +119,6 @@ ASIN(0.8+0.2)
SELECT ASIN(1.2-0.2); SELECT ASIN(1.2-0.2);
ASIN(1.2-0.2) ASIN(1.2-0.2)
1.570796 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
explain extended select degrees(pi()),radians(360); explain extended select degrees(pi()),radians(360);
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used

2
mysql-test/r/rpl_error_ignored_table.result
View File

@ -26,7 +26,7 @@ select (@id := id) - id from t3;
0 0
kill @id; kill @id;
drop table t2,t3; drop table t2,t3;
ERROR 08S01: Server shutdown in progress Got one of the listed errors
show binlog events from 79; show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.000001 79 Query 1 79 use `test`; create table t1 (a int primary key) master-bin.000001 79 Query 1 79 use `test`; create table t1 (a int primary key)

8
mysql-test/t/func_math.test
View File

@ -45,7 +45,9 @@ SELECT ASIN(1.2-0.2);
# Bug #3051 FLOOR returns invalid # Bug #3051 FLOOR returns invalid
# #
select floor(log(4)/log(2)); # This can't be tested as it's not portable
select floor(log(8)/log(2)); #select floor(log(4)/log(2));
select floor(log(16)/log(2)); #select floor(log(8)/log(2));
#select floor(log(16)/log(2));
explain extended select degrees(pi()),radians(360); explain extended select degrees(pi()),radians(360);

2
mysql-test/t/rpl_error_ignored_table.test
View File

@ -45,7 +45,7 @@ select (@id := id) - id from t3;
kill @id; kill @id;
drop table t2,t3; drop table t2,t3;
connection master; connection master;
--error 1053; --error 1053,0;
reap; reap;
connection master1; connection master1;
show binlog events from 79; show binlog events from 79;