diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 20:59:57 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 20:59:57 +0300 |
commit | 7396dfcca7a1eb906edabec02fb59d168f09343d (patch) | |
tree | 5971546f2d27f5a8dc186e0f63ae3d2ac9208a6a /sql/sql_base.h | |
parent | f79c5a658cc33a10d7744a748a4328254e2cbaf7 (diff) | |
parent | 7b5543b21d31bd1517b49c2524a05b5b83fd9691 (diff) | |
download | mariadb-git-7396dfcca7a1eb906edabec02fb59d168f09343d.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_base.h')
-rw-r--r-- | sql/sql_base.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index a6a85d47dc9..8f6d406cb73 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -1,4 +1,6 @@ /* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 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 |