diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-23 15:59:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-23 15:59:24 +0200 |
| commit | f9e5195b40b4b6678b71fdac2b99442664037d36 (patch) | |
| tree | 8da99e7722c1f587c93a65fdc2a465992ec68b82 /sql | |
| parent | 55fc3fb08830cfe8e55b45f5f0e1acf55d00cb4b (diff) | |
| parent | bac287c315b1792e7ae33f91add6a60292f9bae8 (diff) | |
| download | mariadb-git-f9e5195b40b4b6678b71fdac2b99442664037d36.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sql/field_conv.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 36e08010793..02196a7e366 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (c) 2006, 2014, Oracle and/or its affiliates. -# Copyright (c) 2010, 2018, MariaDB +# Copyright (c) 2010, 2018, MariaDB Corporation # # 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/sql/field_conv.cc b/sql/field_conv.cc index 09792aa1660..6e48bf00abc 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2010, 2016, MariaDB + Copyright (c) 2010, 2018, MariaDB Corporation 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 |