diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-21 09:11:14 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-21 09:11:14 +0100 |
| commit | ade89fc8980a0b2763734815df7634a129c6d5dc (patch) | |
| tree | 5b5056d4a183241a8d0a6e2e93d304833934d2e6 /include/mysql/psi/mysql_statement.h | |
| parent | bc43bf3e430c20bc2178e584215bd443054709d6 (diff) | |
| parent | a5b38151c0c020633ff2f3bbd18901427039f5b4 (diff) | |
| download | mariadb-git-ade89fc8980a0b2763734815df7634a129c6d5dc.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'include/mysql/psi/mysql_statement.h')
| -rw-r--r-- | include/mysql/psi/mysql_statement.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/mysql/psi/mysql_statement.h b/include/mysql/psi/mysql_statement.h index 509c9371fe1..6d38131ea99 100644 --- a/include/mysql/psi/mysql_statement.h +++ b/include/mysql/psi/mysql_statement.h @@ -2,13 +2,20 @@ Copyright (c) 2017, 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 - the Free Software Foundation; version 2 of the License. + it under the terms of the GNU General Public License, version 2.0, + as published by the Free Software Foundation. + + This program is also distributed with certain software (including + but not limited to OpenSSL) that is licensed under separate terms, + as designated in a particular file or component or in included license + documentation. The authors of MySQL hereby grant you an additional + permission to link the program and your derivative works with the + separately licensed software that they have included with MySQL. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU General Public License, version 2.0, for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software |