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_priv.h | |
| parent | f79c5a658cc33a10d7744a748a4328254e2cbaf7 (diff) | |
| parent | 7b5543b21d31bd1517b49c2524a05b5b83fd9691 (diff) | |
| download | mariadb-git-7396dfcca7a1eb906edabec02fb59d168f09343d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index ba37d933f12..e48b6195bb7 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2010, 2014, Monty Program Ab. +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. + Copyright (c) 2010, 2018, Monty Program Ab. 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 |