summaryrefslogtreecommitdiff
path: root/mysql-test/r/log_errchk.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-04-24 21:41:00 +0200
committerSergei Golubchik <serg@mariadb.org>2015-04-27 15:42:12 +0200
commit8e781601f46938cb4228bd9a966a9d6871c06859 (patch)
treeb937cb7bcc144de039b04ffb9fa0860cf315c449 /mysql-test/r/log_errchk.result
parentc05d43100b4476a1145d3042ddb61fe792175500 (diff)
downloadmariadb-git-8e781601f46938cb4228bd9a966a9d6871c06859.tar.gz
MDEV-6870 Not possible to use FIFO file as a general_log file
Remove the too restrictive bugfix for bug#67088. FIFO can be used for general/slow logs, but lseek() and fsync() on FIFO fail. And open() needs to be non-blocking, in case the other end isn't reading.
Diffstat (limited to 'mysql-test/r/log_errchk.result')
-rw-r--r--mysql-test/r/log_errchk.result5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/log_errchk.result b/mysql-test/r/log_errchk.result
index 407fba2323e..7311108ace1 100644
--- a/mysql-test/r/log_errchk.result
+++ b/mysql-test/r/log_errchk.result
@@ -1,5 +1,4 @@
-call mtr.add_suppression("Could not use");
-# Case 1: Setting fife file to general_log_file and slow_query_log_file
+# Case 1: Setting fifo file to general_log_file and slow_query_log_file
# system variable.
SET GLOBAL general_log_file="MYSQLTEST_VARDIR/tmp/general_log.fifo";;
ERROR 42000: Variable 'general_log_file' can't be set to the value of 'MYSQLTEST_VARDIR/tmp/general_log.fifo'
@@ -7,4 +6,6 @@ SET GLOBAL slow_query_log_file="MYSQLTEST_VARDIR/tmp/slow_log.fifo";;
ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of 'MYSQLTEST_VARDIR/tmp/slow_log.fifo'
# Case 2: Starting server with fifo file as general log file
# and slow query log file.
+call mtr.add_suppression("Could not use .* for logging \\(error 6\\)");
+call mtr.add_suppression("File '.*' not found \\(Errcode: 6\\)");
Setting fifo file as general log file and slow query log failed.