diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-10-05 16:53:35 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-10-05 16:53:35 +0300 |
| commit | 5f607a2c705063ef23a9974b34151a991e80538f (patch) | |
| tree | 0de4210469ed304104cb40c99052404661177335 /sql/mysqld.cc | |
| parent | 5c3e18fe0e35fe8dc389238e84e644115e9a8535 (diff) | |
| parent | 1351bef4df851f7a867c0732d46a322165168b63 (diff) | |
| download | mariadb-git-5f607a2c705063ef23a9974b34151a991e80538f.tar.gz | |
Automatic merge with 5.1
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e841bae43a4..4e9116874d4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7652,7 +7652,7 @@ each time the SQL thread starts.", "Define threads usage for handling queries: " "one-thread-per-connection" #if HAVE_POOL_OF_THREADS == 1 - ", pool-of-threads" + ", pool-of-threads " #endif "or no-threads.", &opt_thread_handling, &opt_thread_handling, |