diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-20 16:15:05 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-20 16:15:05 +0100 |
| commit | 3a1716a7e79e6fe05a166211002321f73465ec79 (patch) | |
| tree | 8b9eeab4e037c893ea4cd994b5a7d9e1b1825f5b /include/mysql/psi/mysql_socket.h | |
| parent | d07664498be9c71c01c7df9f2fb1d18c7060b2e3 (diff) | |
| parent | 7993f893b844d71183956ee30a6fb37fc10ae90c (diff) | |
| download | mariadb-git-3a1716a7e79e6fe05a166211002321f73465ec79.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'include/mysql/psi/mysql_socket.h')
| -rw-r--r-- | include/mysql/psi/mysql_socket.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h index bdb60c4ad57..88991e62632 100644 --- a/include/mysql/psi/mysql_socket.h +++ b/include/mysql/psi/mysql_socket.h @@ -1,15 +1,21 @@ /* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. 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. +This program is free software; you can redistribute it and/or modify +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. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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 |