summaryrefslogtreecommitdiff
path: root/mysql-test/r/profiling.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
commit1fc57773200240c9836e4bdd634d6fcc1ae32719 (patch)
treed1f4d655f8887b7cd2ec96c8afbbb8b13c97669f /mysql-test/r/profiling.result
parent39315c3c1d753544b757e19ae565f782a24b9261 (diff)
downloadmariadb-git-1fc57773200240c9836e4bdd634d6fcc1ae32719.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/profiling.result')
-rw-r--r--mysql-test/r/profiling.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/profiling.result b/mysql-test/r/profiling.result
index a9ada576b4b..c96074eb830 100644
--- a/mysql-test/r/profiling.result
+++ b/mysql-test/r/profiling.result
@@ -11,6 +11,7 @@ select @@profiling;
0
set global profiling = ON;
ERROR HY000: Variable 'profiling' is a SESSION variable and can't be used with SET GLOBAL
+set @start_value= @@global.profiling_history_size;
set global profiling_history_size=100;
show global variables like 'profil%';
Variable_name Value
@@ -412,4 +413,5 @@ Warnings:
Note 1051 Unknown table 'test.v1'
drop function if exists f1;
set session profiling = OFF;
+set global profiling_history_size= @start_value;
End of 5.0 tests