bzr commit into mysql-trunk branch (mats.kindahl:3194)

[Mats Kindahl]

#At file:///home/bzr/mkindahl/w5363-trunk-stage/ based on revid:mats.kindahl@stripped

 3194 Mats Kindahl	2010-08-18 [merge]
      Merging mysql-5.5-stage into mysql-trunk-stage

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2010-07-23 17:08:41 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2010-08-18 11:09:23 +0000
@@ -681,7 +681,7 @@ The following options may be given as th
  How many threads we should keep in a cache for reuse
  --thread-handling=name 
  Define threads usage for handling queries, one of
- one-thread-per-connection, no-threads
+ one-thread-per-connection, no-threads, loaded-dynamically
  --thread-stack=#    The stack size for each thread
  --time-format=name  The TIME format (ignored)
  --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2010-07-23 17:08:41 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2010-08-18 11:09:23 +0000
@@ -685,7 +685,7 @@ The following options may be given as th
  How many threads we should keep in a cache for reuse
  --thread-handling=name 
  Define threads usage for handling queries, one of
- one-thread-per-connection, no-threads
+ one-thread-per-connection, no-threads, loaded-dynamically
  --thread-stack=#    The stack size for each thread
  --time-format=name  The TIME format (ignored)
  --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are


Attachment: [text/bzr-bundle] bzr/[e-mail]