diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-09-15 17:25:37 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-09-15 17:25:37 +0300 |
| commit | 574e51e5fd53649fb560237eb89a8ff65ac45e22 (patch) | |
| tree | 5bdb04df81e3bfe812c5a280af0aeb842178d56f /mysql-test/r/variables.result | |
| parent | 64d6cbe5568d7185e57c214690be5a24dabef6f6 (diff) | |
| parent | dcce42864014e5ec3c4c22c357093518c6610342 (diff) | |
| download | mariadb-git-574e51e5fd53649fb560237eb89a8ff65ac45e22.tar.gz | |
Merge with 5.2
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 890eb9fcc20..f2eb58b5b4f 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -27,6 +27,7 @@ set @my_thread_cache_size =@@global.thread_cache_size; set @my_max_allowed_packet =@@global.max_allowed_packet; set @my_delay_key_write =@@global.delay_key_write; set @my_join_buffer_size =@@global.join_buffer_size; +set @my_log_warnings =@@global.log_warnings; set @`test`=1; select @test, @`test`, @TEST, @`TEST`, @"teSt"; @test @`test` @TEST @`TEST` @"teSt" @@ -1065,6 +1066,7 @@ set global thread_cache_size =@my_thread_cache_size; set global max_allowed_packet = default; set global delay_key_write =@my_delay_key_write; set global join_buffer_size =@my_join_buffer_size; +set global log_warnings =@my_log_warnings; show global variables where Variable_name='table_definition_cache' or Variable_name='table_lock_wait_timeout'; Variable_name Value |