diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
| commit | a8fdaa6f2c5b2e302bffb069be3475772ca20f48 (patch) | |
| tree | b5c9560ec7346f7af6a5904ad344fdbb8020849c /mysql-test/r/profiling.result | |
| parent | 115efe100dbc1393bce964fa1370e50cfef71d18 (diff) | |
| parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
| download | mariadb-git-a8fdaa6f2c5b2e302bffb069be3475772ca20f48.tar.gz | |
Merge with base MySQL 5.1
Contains fixes for test cases
Changed release tag to beta
configure.in:
change release tag to beta
Diffstat (limited to 'mysql-test/r/profiling.result')
| -rw-r--r-- | mysql-test/r/profiling.result | 2 |
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 |