diff options
| author | Michael Widenius <monty@mysql.com> | 2009-05-19 12:28:05 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-05-19 12:28:05 +0300 |
| commit | 224108a19ec945ac1c3da6c5ec36b6777fd59444 (patch) | |
| tree | 0c9eed2ea6f66b7a2416b6a663906a7841e33deb /mysql-test/t | |
| parent | b94f191a776791e7a120c7e7829be4ffe8109823 (diff) | |
| parent | db020fb30f56c1ec1b1e65304ad5a0830fddab34 (diff) | |
| download | mariadb-git-224108a19ec945ac1c3da6c5ec36b6777fd59444.tar.gz | |
Fixed problems in merge
mysql-test/r/information_schema.result:
Fixed a result file.
mysql-test/r/innodb-autoinc.result:
Fixed a result file.
mysql-test/t/connect.test:
Fixed a problem with merge, needed to close
connections and use the default
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/connect.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/pool_of_threads.cnf | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test index 9eb8241db5c..3e78da29b08 100644 --- a/mysql-test/t/connect.test +++ b/mysql-test/t/connect.test @@ -323,6 +323,10 @@ if ($error) --echo # -- End of 5.1 tests --echo # ------------------------------------------------------------------ +--disconnect extracon +--disconnect extracon2 +--connection default + # Wait till all disconnects are completed --source include/wait_until_count_sessions.inc diff --git a/mysql-test/t/pool_of_threads.cnf b/mysql-test/t/pool_of_threads.cnf index 4ad94ab69d9..b96953ad1c5 100644 --- a/mysql-test/t/pool_of_threads.cnf +++ b/mysql-test/t/pool_of_threads.cnf @@ -2,8 +2,8 @@ [mysqld.1] test-ignore-wrong-options -thread-handling= pool-of-threads -thread_pool_size= 2 +loose-thread-handling= pool-of-threads +loose-thread_pool_size= 2 extra-port= @mysqld.1.#extra-port extra-max-connections=1 |