diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-19 22:27:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-19 22:31:26 +0200 |
| commit | 1a019d08012db7b3fa6a42d39342792c3418e75b (patch) | |
| tree | c116066b995f1c7a2d8c11e72aa9fa547a20407b /sql/mysqld.cc | |
| parent | 5e61e1716e763315009318081fba5994b8910242 (diff) | |
| parent | c0b4d74b52e7eec9b13af732193f7f8d7abe05de (diff) | |
| download | mariadb-git-1a019d08012db7b3fa6a42d39342792c3418e75b.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c78f2ffd94f..5a9aba7f2e4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2008, 2015, SkySQL Ab. + Copyright (c) 2008, 2018, 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 |