diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
| commit | cb67dcb6184535349ca4ff3d7c64eba9c63a0688 (patch) | |
| tree | 10d38ccf7fe60d5ea5c866d37292833b77dfcdae /include | |
| parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
| parent | faec0e2f4aecfc902e354ae7af991779d6bfc4a7 (diff) | |
| download | mariadb-git-cb67dcb6184535349ca4ff3d7c64eba9c63a0688.tar.gz | |
mysql-5.5.37 selective merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_version.h.in | 7 | ||||
| -rw-r--r-- | include/t_ctype.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index 56b2fe50ec0..cceb4e984c7 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -1,6 +1,7 @@ -/* Copyright (c) 1996, 1999-2004, 2007 MySQL AB - Use is subject to license terms - This file is public domain and comes with NO WARRANTY of any kind */ +/* Copyright Abandoned 1996,1999 TCX DataKonsult AB & Monty Program KB + & Detron HB, 1996, 1999-2004, 2007 MySQL AB. + This file is public domain and comes with NO WARRANTY of any kind +*/ /* Version numbers for protocol & mysqld */ diff --git a/include/t_ctype.h b/include/t_ctype.h index 162adc7531c..7db3b7bbf71 100644 --- a/include/t_ctype.h +++ b/include/t_ctype.h @@ -1,4 +1,5 @@ /* Copyright (C) 2000 MySQL AB + Use is subject to license terms 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 |