diff options
Diffstat (limited to 'libservices')
| -rw-r--r-- | libservices/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libservices/debug_sync_service.c | 2 | ||||
| -rw-r--r-- | libservices/my_thread_scheduler_service.c | 20 | ||||
| -rw-r--r-- | libservices/progress_report_service.c | 2 | ||||
| -rw-r--r-- | libservices/thd_alloc_service.c | 2 | ||||
| -rw-r--r-- | libservices/thd_timezone_service.c | 18 | ||||
| -rw-r--r-- | libservices/thd_wait_service.c | 2 |
7 files changed, 24 insertions, 26 deletions
diff --git a/libservices/CMakeLists.txt b/libservices/CMakeLists.txt index 3ffd72aea96..c6e077b0a03 100644 --- a/libservices/CMakeLists.txt +++ b/libservices/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006 MySQL AB, 2010 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006 MySQL AB, 2010 Oracle and/or its affiliates. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ SET(MYSQLSERVICES_SOURCES my_snprintf_service.c thd_alloc_service.c thd_wait_service.c - my_thread_scheduler_service.c + thd_timezone_service.c progress_report_service.c debug_sync_service.c my_sha1_service.c diff --git a/libservices/debug_sync_service.c b/libservices/debug_sync_service.c index 8c7f109e95a..3afa088dee7 100644 --- a/libservices/debug_sync_service.c +++ b/libservices/debug_sync_service.c @@ -15,4 +15,4 @@ */ #include <service_versions.h> -SERVICE_VERSION *debug_sync_service= (void*)VERSION_debug_sync; +SERVICE_VERSION debug_sync_service= (void*)VERSION_debug_sync; diff --git a/libservices/my_thread_scheduler_service.c b/libservices/my_thread_scheduler_service.c deleted file mode 100644 index 0bbad39dd0a..00000000000 --- a/libservices/my_thread_scheduler_service.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include <service_versions.h> -SERVICE_VERSION my_thread_scheduler_service= - (void*)VERSION_my_thread_scheduler; diff --git a/libservices/progress_report_service.c b/libservices/progress_report_service.c index cd8db3eeacb..e55daf31e7d 100644 --- a/libservices/progress_report_service.c +++ b/libservices/progress_report_service.c @@ -14,4 +14,4 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <service_versions.h> -SERVICE_VERSION *progress_report_service= (void*)VERSION_progress_report; +SERVICE_VERSION progress_report_service= (void*)VERSION_progress_report; diff --git a/libservices/thd_alloc_service.c b/libservices/thd_alloc_service.c index 65e3fc490c8..54e498c6cd1 100644 --- a/libservices/thd_alloc_service.c +++ b/libservices/thd_alloc_service.c @@ -15,4 +15,4 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <service_versions.h> -SERVICE_VERSION *thd_alloc_service= (void*)VERSION_thd_alloc; +SERVICE_VERSION thd_alloc_service= (void*)VERSION_thd_alloc; diff --git a/libservices/thd_timezone_service.c b/libservices/thd_timezone_service.c new file mode 100644 index 00000000000..2c93453f8ca --- /dev/null +++ b/libservices/thd_timezone_service.c @@ -0,0 +1,18 @@ +/* Copyright (C) 2013 MariaDB Foundation + Use is subject to license terms. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include <service_versions.h> +SERVICE_VERSION thd_timezone_service= (void *) VERSION_thd_timezone; diff --git a/libservices/thd_wait_service.c b/libservices/thd_wait_service.c index 8cec4eecf77..1f8c19ac555 100644 --- a/libservices/thd_wait_service.c +++ b/libservices/thd_wait_service.c @@ -16,4 +16,4 @@ */ #include <service_versions.h> -SERVICE_VERSION *thd_wait_service= (void*)VERSION_thd_wait; +SERVICE_VERSION thd_wait_service= (void*)VERSION_thd_wait; |