From 8c3048e9da7473fea1d2ca4276245724d6197673 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Nov 2007 16:12:46 -0500 Subject: Bug#28785 thread-handling not displayed properly in SHOW VARIABLES mysql-test/r/no-threads.result: Test that we are in the 'no-threads' thread_handling mode. mysql-test/t/no-threads.test: Test that we are in the 'no-threads' thread_handling mode. sql/mysqld.cc: Changes to make global_system_variables.thread_handling be zero based, instead of 1 based. sql/scheduler.h: Changed the enum to start at 0, to match the array elements in thread_handling_names in mysqld.cc --- sql/mysqld.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sql/mysqld.cc') diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 4cf6e05751f..f65fee872ed 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7745,12 +7745,13 @@ mysqld_get_one_option(int optid, break; } case OPT_ONE_THREAD: - global_system_variables.thread_handling= 2; + global_system_variables.thread_handling= + SCHEDULER_ONE_THREAD_PER_CONNECTION; break; case OPT_THREAD_HANDLING: { global_system_variables.thread_handling= - find_type_or_exit(argument, &thread_handling_typelib, opt->name); + find_type_or_exit(argument, &thread_handling_typelib, opt->name)-1; break; } case OPT_FT_BOOLEAN_SYNTAX: -- cgit v1.2.1