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 /libmysql | |
| 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 'libmysql')
| -rw-r--r-- | libmysql/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libmysql/conf_to_src.c | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 980f92888a0..bbd534666c0 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -1,4 +1,5 @@ -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. +# Copyright (c) 2009, 2013, SkySQL 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/libmysql/conf_to_src.c b/libmysql/conf_to_src.c index 04a6a727029..a5a7d23db0b 100644 --- a/libmysql/conf_to_src.c +++ b/libmysql/conf_to_src.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2004 MySQL AB +/* Copyright (c) 2000, 2011, 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 diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 242144abc50..e66a757424e 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2012, Oracle and/or its affiliates - Copyright (c) 2009, 2012, Monty Program Ab +/* Copyright (c) 2000, 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 |