diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-10 08:20:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-10 08:20:27 +0200 |
| commit | 73216f79e431e491649587856529e8797f7a5a3f (patch) | |
| tree | bb962db1c7a968f1a3be979540d44c02039ea05c /include | |
| parent | dabf4715475a2f80de319a440d4153a5434b2fbf (diff) | |
| parent | 56f64f796ea5002a97184c6bb40e8f8199520e51 (diff) | |
| download | mariadb-git-73216f79e431e491649587856529e8797f7a5a3f.tar.gz | |
10.0 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 |