diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-27 20:46:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-27 20:46:38 +0200 |
| commit | 37ab7e45963627f3c1ea2dd43d5b305de37bb16f (patch) | |
| tree | e07ada7fbde72c438f2a6a6c162e050caf1950f9 /sql/field_conv.cc | |
| parent | 30c3d6db328d73f1b30be537aceb55d37936fdb9 (diff) | |
| parent | 893ebb739e24637985892da1555f2e6f1a8ac5b6 (diff) | |
| download | mariadb-git-37ab7e45963627f3c1ea2dd43d5b305de37bb16f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index ec3e6c3aaaf..ae70dfd408e 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 |