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

File tree

1,698 files changed

+1757
-3412
lines changed

Some content is hidden

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

1,698 files changed

+1757
-3412
lines changed

‎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

‎client/mysql_upgrade.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/mysqladmin.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/mysqlbinlog.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/mysqlcheck.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/mysqldump.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/mysqlimport.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/mysqlshow.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/mysqltest.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/readline.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/sql_string.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/sql_string.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

‎cmd-line-utils/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

‎dbug/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

‎extra/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

‎extra/charset2html.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

‎extra/comp_err.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

‎extra/innochecksum.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

‎extra/my_print_defaults.c

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

‎extra/mysql_waitpid.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

‎extra/perror.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

‎extra/replace.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

‎extra/resolve_stack_dump.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

‎extra/resolveip.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

‎include/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

‎include/base64.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

‎include/config-netware.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

‎include/config-win.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

‎include/decimal.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

‎include/errmsg.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

0 commit comments

Comments
 (0)