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

[Horst Hunger]

#At file:///work/bzr/mysql-5.1-sys-var/

 2734 Horst Hunger	2008-09-02
      Fix for bug#37766: Inserted 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:39:17 +0000
+++ b/mysql-test/r/log_output_func.result	2008-09-02 20:38:14 +0000
@@ -37,7 +37,7 @@ 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:39:17 +0000
+++ b/mysql-test/t/log_output_func.test	2008-09-02 20:38:14 +0000
@@ -89,6 +89,7 @@ SELECT count(*)>4 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';