merge with 4.0 to get portability fixes

mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged

5 files changed, 8 insertions, 15 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index b041bfb8369..b4d5958fb50 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -18,7 +18,7 @@ TZ=$MY_TZ; export TZ # for UNIX_TIMESTAMP tests to work
 LOCAL_SOCKET=@MYSQL_UNIX_ADDR@
 
 # For query_cache test
-case "$SYSTEM" in
+case `uname` in
     SCO_SV | UnixWare | OpenUNIX )
         # do nothing (Causes strange behavior)
         ;;
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index 93d4319ea86..9085849e582 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -119,15 +119,6 @@ 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
 explain extended select degrees(pi()),radians(360);
 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
diff --git a/mysql-test/r/rpl_error_ignored_table.result b/mysql-test/r/rpl_error_ignored_table.result
index 247b88e42c1..dd277e41ad0 100644
--- a/mysql-test/r/rpl_error_ignored_table.result
+++ b/mysql-test/r/rpl_error_ignored_table.result
@@ -26,7 +26,7 @@ select (@id := id) - id from t3;
 0
 kill @id;
 drop table t2,t3;
-ERROR 08S01: 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.000001	79	Query	1	79	use `test`; create table t1 (a int primary key)
diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test
index 242295f2018..36ad2dfb0a2 100644
--- a/mysql-test/t/func_math.test
+++ b/mysql-test/t/func_math.test
@@ -45,7 +45,9 @@ 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));
+
 explain extended select degrees(pi()),radians(360);
diff --git a/mysql-test/t/rpl_error_ignored_table.test b/mysql-test/t/rpl_error_ignored_table.test
index f6d9ffa8125..40dbe455c7a 100644
--- a/mysql-test/t/rpl_error_ignored_table.test
+++ b/mysql-test/t/rpl_error_ignored_table.test
@@ -45,7 +45,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;