diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-13 08:09:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-13 08:09:07 +0100 |
| commit | 5f5d2db1415cb32f03b39224267b83ac721ff68c (patch) | |
| tree | 17b38a2b1bdac8f32b34cfa8171371bbeed560df /sql/scheduler.cc | |
| parent | 52f038c5c3a065d2c68197535d844f6ed00a09cc (diff) | |
| download | mariadb-git-5f5d2db1415cb32f03b39224267b83ac721ff68c.tar.gz | |
fix embedded tests
(mainly by backporting 5.5. changes)
mysql-test/suite/maria/t/distinct.test:
Remove the test that requires SSL. One test case for a bug is enough.
sql/scheduler.cc:
make it the same as in 5.5
storage/innodb_plugin/row/row0mysql.c:
make it the same as in 5.5
storage/innodb_plugin/row/row0sel.c:
make it the same as in 5.5
storage/xtradb/row/row0mysql.c:
make it the same as in 5.5
storage/xtradb/row/row0sel.c:
make it the same as in 5.5
Diffstat (limited to 'sql/scheduler.cc')
| -rw-r--r-- | sql/scheduler.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/scheduler.cc b/sql/scheduler.cc index 5b8f834aecc..cf60e461bb9 100644 --- a/sql/scheduler.cc +++ b/sql/scheduler.cc @@ -69,7 +69,6 @@ static bool no_threads_end(THD *thd, bool put_in_cache) void one_thread_scheduler(scheduler_functions *func) { func->max_threads= 1; - max_connections= 1; func->max_connections= &max_connections; func->connection_count= &connection_count; #ifndef EMBEDDED_LIBRARY |