bzr commit into mysql-5.1 branch (horst:2672) Bug#37766

[Horst Hunger]

#At file:///work/bzr/mysql-5.1-serverqa/

 2672 Horst Hunger	2008-09-02
      fix for bug#37766: Inserted a replace_result.
modified:
  mysql-test/r/log_output_func.result
  mysql-test/t/log_output_func.test

=== modified file 'mysql-test/r/log_output_func.result'
--- a/mysql-test/r/log_output_func.result	2008-09-02 16:10:22 +0000
+++ b/mysql-test/r/log_output_func.result	2008-09-02 17:03:55 +0000
@@ -32,12 +32,12 @@ INSERT INTO t1 VALUE(1);
 SELECT 'abc';
 abc
 abc
-SELECT count(*) FROM mysql.general_log;
-count(*)
-5
+SELECT count(*)>4 FROM mysql.general_log;
+count(*)>4
+1
 SET @@global.general_log = 'OFF';
 FLUSH LOGS;
-SET @@global.general_log_file = '/work/bzr/mysql-5.1-sys-var/mysql-test/var/run/mytest.log';
+SET @@global.general_log_file = 'MYSQLTEST_VARDIR/run/mytest.log';
 SET @@global.general_log = 'ON';
 SET @@global.log_output = 'FILE';
 TRUNCATE TABLE mysql.general_log;

=== modified file 'mysql-test/t/log_output_func.test'
--- a/mysql-test/t/log_output_func.test	2008-09-02 16:10:22 +0000
+++ b/mysql-test/t/log_output_func.test	2008-09-02 17:03:55 +0000
@@ -80,7 +80,8 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(a int);
 INSERT INTO t1 VALUE(1);
 SELECT 'abc';
-SELECT count(*) FROM mysql.general_log;
+# At least the last 4 statement should be logged.
+SELECT count(*)>4 FROM mysql.general_log;
 
 #===============================================================
 # Checking general_log when log_output is FILE
@@ -88,6 +89,7 @@ SELECT count(*) FROM mysql.general_log;
 
 SET @@global.general_log = 'OFF';
 FLUSH LOGS;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval SET @@global.general_log_file = '$MYSQLTEST_VARDIR/run/mytest.log';
 SET @@global.general_log = 'ON';
 SET @@global.log_output = 'FILE';