diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
| commit | 704b4845aa9ce51a6c5a9f5f42265e376db0dfb3 (patch) | |
| tree | 73476f970c229f75846855edeeddfbc6fd87ed4b /mysql-test/r/profiling.result | |
| parent | 2637dda66845868fe996e60e54996acf03f6c537 (diff) | |
| parent | a5e5b0180a6b86cce258eef232ef59d6e7c40bb0 (diff) | |
| download | mariadb-git-704b4845aa9ce51a6c5a9f5f42265e376db0dfb3.tar.gz | |
merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.
mysys/thr_mutex.c:
adding DBUG_PRINT here, so that we can locate where the warning is issued.
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 |