diff options
| author | unknown <dkatz@damien-katzs-computer.local> | 2007-11-14 16:12:46 -0500 |
|---|---|---|
| committer | unknown <dkatz@damien-katzs-computer.local> | 2007-11-14 16:12:46 -0500 |
| commit | 8c3048e9da7473fea1d2ca4276245724d6197673 (patch) | |
| tree | db5b048d932d54bae48b133475186832d5afab92 /sql/mysqld.cc | |
| parent | 7eef514621ade372082cf26478b594c218b598b5 (diff) | |
| download | mariadb-git-8c3048e9da7473fea1d2ca4276245724d6197673.tar.gz | |
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
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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: |