Skip to content

Commit be15e3b

Browse files
author
kent@kent-amd64.(none)
committed
Merge mysql.com:/home/kent/bk/main/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.1
2 parents 3368730 + 226a5c8 commit be15e3b

1,698 files changed

Lines changed: 1757 additions & 3412 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

BUILD/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#
33
# This library is free software; you can redistribute it and/or
44
# modify it under the terms of the GNU Library General Public
5-
# License as published by the Free Software Foundation; either
6-
# version 2 of the License, or (at your option) any later version.
5+
# License as published by the Free Software Foundation; version 2
6+
# of the License.
77
#
88
# This library is distributed in the hope that it will be useful,
99
# but WITHOUT ANY WARRANTY; without even the implied warranty of

Docs/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
5-
# the Free Software Foundation; either version 2 of the License, or
6-
# (at your option) any later version.
5+
# the Free Software Foundation; version 2 of the License.
76
#
87
# This program is distributed in the hope that it will be useful,
98
# but WITHOUT ANY WARRANTY; without even the implied warranty of

Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
5-
# the Free Software Foundation; either version 2 of the License, or
6-
# (at your option) any later version.
5+
# the Free Software Foundation; version 2 of the License.
76
#
87
# This program is distributed in the hope that it will be useful,
98
# but WITHOUT ANY WARRANTY; without even the implied warranty of

client/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
5-
# the Free Software Foundation; either version 2 of the License, or
6-
# (at your option) any later version.
5+
# the Free Software Foundation; version 2 of the License.
76
#
87
# This program is distributed in the hope that it will be useful,
98
# but WITHOUT ANY WARRANTY; without even the implied warranty of

client/client_priv.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
5-
the Free Software Foundation; either version 2 of the License, or
6-
(at your option) any later version.
5+
the Free Software Foundation; version 2 of the License.
76
87
This program is distributed in the hope that it will be useful,
98
but WITHOUT ANY WARRANTY; without even the implied warranty of

client/completion_hash.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
5-
the Free Software Foundation; either version 2 of the License, or
6-
(at your option) any later version.
5+
the Free Software Foundation; version 2 of the License.
76
87
This program is distributed in the hope that it will be useful,
98
but WITHOUT ANY WARRANTY; without even the implied warranty of

client/completion_hash.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
33
This library is free software; you can redistribute it and/or
44
modify it under the terms of the GNU Library General Public
5-
License as published by the Free Software Foundation; either
6-
version 2 of the License, or (at your option) any later version.
5+
License as published by the Free Software Foundation; version 2
6+
of the License.
77
88
This library is distributed in the hope that it will be useful,
99
but WITHOUT ANY WARRANTY; without even the implied warranty of

client/get_password.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
5-
the Free Software Foundation; either version 2 of the License, or
6-
(at your option) any later version.
5+
the Free Software Foundation; version 2 of the License.
76
87
This program is distributed in the hope that it will be useful,
98
but WITHOUT ANY WARRANTY; without even the implied warranty of

client/my_readline.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
5-
the Free Software Foundation; either version 2 of the License, or
6-
(at your option) any later version.
5+
the Free Software Foundation; version 2 of the License.
76
87
This program is distributed in the hope that it will be useful,
98
but WITHOUT ANY WARRANTY; without even the implied warranty of

client/mysql.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
5-
the Free Software Foundation; either version 2 of the License, or
6-
(at your option) any later version.
5+
the Free Software Foundation; version 2 of the License.
76
87
This program is distributed in the hope that it will be useful,
98
but WITHOUT ANY WARRANTY; without even the implied warranty of

0 commit comments

Comments
 (0)