diff options
| author | Mats Kindahl <mats.kindahl@oracle.com> | 2010-06-15 09:44:26 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats.kindahl@oracle.com> | 2010-06-15 09:44:26 +0200 |
| commit | 7017775fd11c4249c1b64ff45564c88b94cf526f (patch) | |
| tree | e58e2c206bb5fa1bac10b764c52863f2fcd03c03 /sql/scheduler.cc | |
| parent | aaf2bdde94c582086e4ced9f9ce84b9a276d36aa (diff) | |
| download | mariadb-git-7017775fd11c4249c1b64ff45564c88b94cf526f.tar.gz | |
WL#5363: Thread Pool Service Interface
Fixes to ensure that it builds with the embedded server as well.
Diffstat (limited to 'sql/scheduler.cc')
| -rw-r--r-- | sql/scheduler.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/scheduler.cc b/sql/scheduler.cc index 19f8ddc7355..d61a452b99e 100644 --- a/sql/scheduler.cc +++ b/sql/scheduler.cc @@ -44,7 +44,11 @@ static scheduler_functions one_thread_scheduler_functions= 1, // max_threads NULL, // init init_new_connection_handler_thread, // init_new_connection_thread +#ifndef EMBEDDED_LIBRARY handle_connection_in_main_thread, // add_connection +#else + NULL, // add_connection +#endif // EMBEDDED_LIBRARY NULL, // thd_wait_begin NULL, // thd_wait_end NULL, // post_kill_notification @@ -52,6 +56,7 @@ static scheduler_functions one_thread_scheduler_functions= NULL, // end }; +#ifndef EMBEDDED_LIBRARY static scheduler_functions one_thread_per_connection_scheduler_functions= { 0, // max_threads @@ -64,10 +69,10 @@ static scheduler_functions one_thread_per_connection_scheduler_functions= one_thread_per_connection_end, // end_thread NULL, // end }; +#endif // EMBEDDED_LIBRARY -scheduler_functions *thread_scheduler= - &one_thread_per_connection_scheduler_functions; +scheduler_functions *thread_scheduler= NULL; /** @internal Helper functions to allow mysys to call the thread scheduler when |