diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-06 22:31:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-06 22:31:30 +0200 |
| commit | b838d081ad346e52787753b1799c627922c4a6c7 (patch) | |
| tree | dc8f1e21e6b40d5b72668571c570c9a3214fbf32 /sql/sql_load.cc | |
| parent | 824db55ce53963a64fcf648b54500df22c57e9b2 (diff) | |
| parent | 72c36f4415815d55ddb82b23682f3c549906c00e (diff) | |
| download | mariadb-git-b838d081ad346e52787753b1799c627922c4a6c7.tar.gz | |
mysql-5.5.33 merge
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index b060d116214..493a38ce0f5 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1,5 +1,6 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) 2000, 2013, Oracle and/or its affiliates. + Copyright (c) 2010, 2013, Monty Progrm 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 |