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 /scripts/mysql_system_tables.sql | |
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 'scripts/mysql_system_tables.sql')
-rw-r--r-- | scripts/mysql_system_tables.sql | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index 837f1177430..e9b54f24668 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2007, 2008 MySQL AB, 2009 Sun Microsystems, Inc. --- Copyright (c) 2008-2011 Monty Program Ab --- Use is subject to license terms. --- +-- Copyright (c) 2007, 2013, Oracle and/or its affiliates. +-- Copyright (c) 2008, 2014, 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 -- the Free Software Foundation; version 2 of the License. |