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 /mysql-test/lib/My/SafeProcess | |
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 'mysql-test/lib/My/SafeProcess')
-rw-r--r-- | mysql-test/lib/My/SafeProcess/safe_process.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc index 007acf77617..f19ca622278 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2011, Oracle and/or its affiliates +/* Copyright (c) 2008, 2012, 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 |