diff options
| author | kent@kent-amd64.(none) <> | 2006-12-23 20:20:40 +0100 |
|---|---|---|
| committer | kent@kent-amd64.(none) <> | 2006-12-23 20:20:40 +0100 |
| commit | be15e3bc15921085ea558f8764ed1fad137ccaa1 (patch) | |
| tree | 5283b715c9535e3fdade4d3cf17559c467d87078 /sql-common | |
| parent | 3368730535915c58d8bb68cffc35c53192002de6 (diff) | |
| parent | 226a5c833f3084bc634996c70d47a1c0d9164e0d (diff) | |
| download | mariadb-git-be15e3bc15921085ea558f8764ed1fad137ccaa1.tar.gz | |
Merge mysql.com:/home/kent/bk/main/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.1
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/Makefile.am | 3 | ||||
| -rw-r--r-- | sql-common/client.c | 3 | ||||
| -rw-r--r-- | sql-common/my_time.c | 3 | ||||
| -rw-r--r-- | sql-common/my_user.c | 3 | ||||
| -rw-r--r-- | sql-common/pack.c | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/sql-common/Makefile.am b/sql-common/Makefile.am index d71523a741c..30e1ff13e7e 100644 --- a/sql-common/Makefile.am +++ b/sql-common/Makefile.am @@ -2,8 +2,7 @@ # # 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; either version 2 of the License, or -# (at your option) any later version. +# the Free Software Foundation; version 2 of the License. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/sql-common/client.c b/sql-common/client.c index 59717186fbd..9a78f11869e 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2,8 +2,7 @@ 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; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/sql-common/my_time.c b/sql-common/my_time.c index dcbd2eacdc1..946c0d8adf1 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -2,8 +2,7 @@ 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; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/sql-common/my_user.c b/sql-common/my_user.c index c39f08e520f..fa5b80413bf 100644 --- a/sql-common/my_user.c +++ b/sql-common/my_user.c @@ -2,8 +2,7 @@ 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; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/sql-common/pack.c b/sql-common/pack.c index ed79143a04b..33c1103fb04 100644 --- a/sql-common/pack.c +++ b/sql-common/pack.c @@ -2,8 +2,7 @@ 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; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of |