diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-17 11:00:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-17 11:00:51 +0100 |
| commit | 84651126c0f101ea762eec0eb4045f533a00e96d (patch) | |
| tree | 1bba1d0079b08cb10fe69e03942cd5f254dc735e /include/mysql | |
| parent | 1fa5183241e5a8e8e91690f0c35d676e9f3334ca (diff) | |
| parent | f7c8dd6bc7bb6d46d1ae2b6fdb47227429387e33 (diff) | |
| download | mariadb-git-84651126c0f101ea762eec0eb4045f533a00e96d.tar.gz | |
MySQL-5.5.36 merge
(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/plugin.h | 4 | ||||
| -rw-r--r-- | include/mysql/plugin_audit.h | 2 | ||||
| -rw-r--r-- | include/mysql/psi/mysql_thread.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 74b37c5f229..6b2dba46193 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2005, 2011, Oracle and/or its affiliates - Copyright (C) 2009, 2011, Monty Program Ab +/* Copyright (c) 2005, 2013, Oracle and/or its affiliates + Copyright (C) 2009, 2013, Monty Program Ab 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 diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h index 99f5744cd35..31589f071f0 100644 --- a/include/mysql/plugin_audit.h +++ b/include/mysql/plugin_audit.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2007, 2013, 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 diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h index 7615985ec24..f421f95cfd5 100644 --- a/include/mysql/psi/mysql_thread.h +++ b/include/mysql/psi/mysql_thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2013, 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 @@ -995,7 +995,7 @@ static inline int inline_mysql_cond_wait( static inline int inline_mysql_cond_timedwait( mysql_cond_t *that, mysql_mutex_t *mutex, - struct timespec *abstime + const struct timespec *abstime #if defined(HAVE_PSI_INTERFACE) || defined(SAFE_MUTEX) , const char *src_file, uint src_line #endif |