diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 18:52:17 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 19:07:25 +0300 |
commit | 37c14690fc6bc9237bdad9b8e26157d1174a49fc (patch) | |
tree | 490ab3103b3f2dbef654fdd860e891ccde87d93c /sql/sql_connect.cc | |
parent | aae3f921adec9b9d1bff093c9a75a94e44f5c8d4 (diff) | |
parent | e2f1f88fa60680cb87833a7cceb172f5d436a804 (diff) | |
download | mariadb-git-37c14690fc6bc9237bdad9b8e26157d1174a49fc.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r-- | sql/sql_connect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index d5a90089da4..aa9e561a717 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2007, 2013, Oracle and/or its affiliates. - Copyright (c) 2008, 2016, MariaDB + Copyright (c) 2008, 2020, MariaDB 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 |