diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-08 19:17:49 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-08 19:17:49 +0100 |
| commit | e91bbca5fb080a8d988c156d78c7dc1b1daaad82 (patch) | |
| tree | edeb15da451e956ae0d6874657c910ab0df111f8 /mysql-test | |
| parent | 5e7b949e61f4330e27013c8ec81fa3d450e5dce6 (diff) | |
| download | mariadb-git-e91bbca5fb080a8d988c156d78c7dc1b1daaad82.tar.gz | |
Initial threadpool implementation for MariaDB 5.5
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/t/slow_launch_time_func.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/wait_timeout.test | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 25427b81eff..e4cd9e6ab89 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3461,7 +3461,9 @@ sub mysql_install_db { mtr_add_arg($args, "--loose-skip-ndbcluster"); mtr_add_arg($args, "--loose-skip-aria"); mtr_add_arg($args, "--disable-sync-frm"); - mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/"); + mtr_add_arg($args, "--tmpdir=."); + mtr_add_arg($args, "--max_allowed_packet=8M"); + mtr_add_arg($args, "--net_buffer_length=16K"); mtr_add_arg($args, "--core-file"); if ( $opt_debug ) diff --git a/mysql-test/suite/sys_vars/t/slow_launch_time_func.test b/mysql-test/suite/sys_vars/t/slow_launch_time_func.test index c9fc357b10f..a5b429f81cb 100644 --- a/mysql-test/suite/sys_vars/t/slow_launch_time_func.test +++ b/mysql-test/suite/sys_vars/t/slow_launch_time_func.test @@ -29,7 +29,7 @@ # # Setup # - +--source include/not_threadpool.inc --source include/not_embedded.inc --source include/not_threadpool.inc diff --git a/mysql-test/t/wait_timeout.test b/mysql-test/t/wait_timeout.test index eb86cf17ebb..68c0957347d 100644 --- a/mysql-test/t/wait_timeout.test +++ b/mysql-test/t/wait_timeout.test @@ -8,7 +8,7 @@ ############################################################################### # These tests cannot run with the embedded server -- source include/not_embedded.inc --- source include/one_thread_per_connection.inc +#-- source include/one_thread_per_connection.inc # Save the initial number of concurrent sessions --source include/count_sessions.inc |