From c2703aaa61a783748d67510655d589d104bebc9f Mon Sep 17 00:00:00 2001 From: Mikael Ronstrom Date: Wed, 15 Oct 2008 22:48:40 +0200 Subject: [PATCH] merge test case changes for innodb thread concurrency --- mysql-test/r/innodb.result | 2 +- mysql-test/r/innodb_thread_concurrency_basic.result | 8 ++++---- mysql-test/t/innodb_thread_concurrency_basic.test | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 84760e1720c..59a243ae6f1 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1782,7 +1782,7 @@ Variable_name Value innodb_sync_spin_loops 20 show variables like "innodb_thread_concurrency"; Variable_name Value -innodb_thread_concurrency 8 +innodb_thread_concurrency 0 set global innodb_thread_concurrency=1001; Warnings: Warning 1292 Truncated incorrect thread_concurrency value: '1001' diff --git a/mysql-test/r/innodb_thread_concurrency_basic.result b/mysql-test/r/innodb_thread_concurrency_basic.result index 65a79fecd97..b27bbce5b3c 100644 --- a/mysql-test/r/innodb_thread_concurrency_basic.result +++ b/mysql-test/r/innodb_thread_concurrency_basic.result @@ -1,19 +1,19 @@ SET @global_start_value = @@global.innodb_thread_concurrency; SELECT @global_start_value; @global_start_value -8 +0 '#--------------------FN_DYNVARS_046_01------------------------#' SET @@global.innodb_thread_concurrency = 0; SET @@global.innodb_thread_concurrency = DEFAULT; SELECT @@global.innodb_thread_concurrency; @@global.innodb_thread_concurrency -8 +0 '#---------------------FN_DYNVARS_046_02-------------------------#' SET innodb_thread_concurrency = 1; ERROR HY000: Variable 'innodb_thread_concurrency' is a GLOBAL variable and should be set with SET GLOBAL SELECT @@innodb_thread_concurrency; @@innodb_thread_concurrency -8 +0 SELECT local.innodb_thread_concurrency; ERROR 42S02: Unknown table 'local' in field list SET global innodb_thread_concurrency = 0; @@ -93,4 +93,4 @@ SELECT @@global.innodb_thread_concurrency; SET @@global.innodb_thread_concurrency = @global_start_value; SELECT @@global.innodb_thread_concurrency; @@global.innodb_thread_concurrency -8 +0 diff --git a/mysql-test/t/innodb_thread_concurrency_basic.test b/mysql-test/t/innodb_thread_concurrency_basic.test index 40ce09ce4db..d30ec214f4a 100644 --- a/mysql-test/t/innodb_thread_concurrency_basic.test +++ b/mysql-test/t/innodb_thread_concurrency_basic.test @@ -4,7 +4,7 @@ # Scope: GLOBAL # # Access Type: Dynamic # # Data Type: Numeric # -# Default Value: 8 # +# Default Value: 0 # # Range: 0-1000 # # # # #