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 /mysys | |
| parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
| parent | faec0e2f4aecfc902e354ae7af991779d6bfc4a7 (diff) | |
| download | mariadb-git-cb67dcb6184535349ca4ff3d7c64eba9c63a0688.tar.gz | |
mysql-5.5.37 selective merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_arr_appstr.c | 1 | ||||
| -rw-r--r-- | mysys/mf_qsort2.c | 1 | ||||
| -rw-r--r-- | mysys/my_alarm.c | 1 | ||||
| -rw-r--r-- | mysys/my_libwrap.c | 1 | ||||
| -rw-r--r-- | mysys/sha1.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/mysys/mf_arr_appstr.c b/mysys/mf_arr_appstr.c index 5ea0a098c5d..d5a0e0707dc 100644 --- a/mysys/mf_arr_appstr.c +++ b/mysys/mf_arr_appstr.c @@ -1,4 +1,5 @@ /* Copyright (C) 2007 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 diff --git a/mysys/mf_qsort2.c b/mysys/mf_qsort2.c index 29f92c38926..501f08c5dce 100644 --- a/mysys/mf_qsort2.c +++ b/mysys/mf_qsort2.c @@ -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 diff --git a/mysys/my_alarm.c b/mysys/my_alarm.c index 31f98958f61..4672627a908 100644 --- a/mysys/my_alarm.c +++ b/mysys/my_alarm.c @@ -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 diff --git a/mysys/my_libwrap.c b/mysys/my_libwrap.c index 1cbfa83030b..6c69757ec6f 100644 --- a/mysys/my_libwrap.c +++ b/mysys/my_libwrap.c @@ -1,4 +1,5 @@ /* Copyright (c) 2003, 2006 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 diff --git a/mysys/sha1.c b/mysys/sha1.c index e5b33a9ad13..a247d69f5b1 100644 --- a/mysys/sha1.c +++ b/mysys/sha1.c @@ -1,4 +1,5 @@ /* Copyright (c) 2002, 2004, 2006 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 |