diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 14:58:19 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 14:58:19 +0200 |
commit | a79d46c3a4839fa15c9f78dc2d5858ef948add18 (patch) | |
tree | 1411394a02293e91c8b1d75b3c87cc4724b899d2 /storage/innobase/include/srv0srv.h | |
parent | c081c978a2c83b9dc9efa84414cf40232460987d (diff) | |
parent | 720e04ff6760e9d04566d7fb33131fd1886ef4cd (diff) | |
download | mariadb-git-a79d46c3a4839fa15c9f78dc2d5858ef948add18.tar.gz |
Merge branch 'merge-innodb-5.6' into 10.0
Diffstat (limited to 'storage/innobase/include/srv0srv.h')
-rw-r--r-- | storage/innobase/include/srv0srv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index 30e52dcfb2d..b8e1fcbbaf6 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2008, 2009, Google Inc. Copyright (c) 2009, Percona Inc. Copyright (c) 2013, 2014, SkySQL Ab. All Rights Reserved. @@ -758,7 +758,7 @@ UNIV_INTERN os_thread_ret_t DECLARE_THREAD(srv_purge_coordinator_thread)( /*=========================================*/ - void* arg __attribute__((unused))); /*!< in: a dummy parameter + void* arg MY_ATTRIBUTE((unused))); /*!< in: a dummy parameter required by os_thread_create */ /*********************************************************************//** @@ -768,7 +768,7 @@ UNIV_INTERN os_thread_ret_t DECLARE_THREAD(srv_worker_thread)( /*==============================*/ - void* arg __attribute__((unused))); /*!< in: a dummy parameter + void* arg MY_ATTRIBUTE((unused))); /*!< in: a dummy parameter required by os_thread_create */ } /* extern "C" */ |