summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables-notembedded.result
diff options
context:
space:
mode:
authorHorst Hunger <horst@mysql.com>2008-09-10 12:50:39 +0200
committerHorst Hunger <horst@mysql.com>2008-09-10 12:50:39 +0200
commita5e248d4023180d81c27acb9f764e00d4b7cc488 (patch)
treed1f4d655f8887b7cd2ec96c8afbbb8b13c97669f /mysql-test/r/variables-notembedded.result
parent54eff66e25702327e51c728a9eb6b6cdd2383d86 (diff)
downloadmariadb-git-a5e248d4023180d81c27acb9f764e00d4b7cc488.tar.gz
Final fix for bug#38349: Did the changes due to the 2 reviews.
- Updated slow_query_log_file_basic and general_log_file basis instead of the func version as the func version run good but the basic versions fail. - Sent innodb.test to dev@innodb.com. - variables.test has differences probably due to a bug in mtr or in the SET statement (see bug#39369). - general_log_file_basic.test and slow_query_log_file_bsaic.test have differences, which might be produced by the new mtr (see bug#38124).
Diffstat (limited to 'mysql-test/r/variables-notembedded.result')
-rw-r--r--mysql-test/r/variables-notembedded.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/variables-notembedded.result b/mysql-test/r/variables-notembedded.result
index 48a1719e2c7..e241edcc5ec 100644
--- a/mysql-test/r/variables-notembedded.result
+++ b/mysql-test/r/variables-notembedded.result
@@ -15,3 +15,4 @@ slave_skip_errors 3,100,137,643,1752
---- Clean Up ----
set global slave_net_timeout=default;
set global sql_slave_skip_counter= 0;
+set @@global.slave_net_timeout= @my_slave_net_timeout;