Skip to content

Commit 58763e3

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 895e442 + 1b8bd0d commit 58763e3

460 files changed

Lines changed: 2066 additions & 439 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
1+
# Copyright (C) 2002, 2004-2005 MySQL AB
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

‎Docs/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
1+
# Copyright (C) 2000-2006 MySQL AB
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

‎Docs/generate-text-files.pl‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
#!/usr/bin/perl -w -*- perl -*-
2+
# Copyright (C) 2000, 2003, 2005 MySQL AB
3+
#
4+
# This program is free software; you can redistribute it and/or modify
5+
# it under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation; version 2 of the License.
7+
#
8+
# This program is distributed in the hope that it will be useful,
9+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
# GNU General Public License for more details.
12+
#
13+
# You should have received a copy of the GNU General Public License
14+
# along with this program; if not, write to the Free Software
15+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
217
# Generate text files from top directory from the manual.
318

419
$from = shift(@ARGV);

‎Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
1+
# Copyright (C) 2000-2006 MySQL AB
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
@@ -159,4 +159,3 @@ test-force-full-pl: test-force-full
159159

160160
# Don't update the files from bitkeeper
161161
%::SCCS/s.%
162-

‎client/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
1+
# Copyright (C) 2000-2006 MySQL AB
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

‎client/client_priv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
1+
/* Copyright (C) 2001-2006 MySQL AB
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

‎client/completion_hash.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
1+
/* Copyright (C) 2000-2002 MySQL AB
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

‎client/mysqladmin.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2000-2004 MySQL AB
1+
/* Copyright (C) 2000-2006 MySQL AB
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
@@ -615,7 +615,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
615615
case ADMIN_VER:
616616
new_line=1;
617617
print_version();
618-
puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB");
618+
puts("Copyright (C) 2000-2006 MySQL AB");
619619
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
620620
printf("Server version\t\t%s\n", mysql_get_server_info(mysql));
621621
printf("Protocol version\t%d\n", mysql_get_proto_info(mysql));
@@ -1004,7 +1004,7 @@ static void print_version(void)
10041004
static void usage(void)
10051005
{
10061006
print_version();
1007-
puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB");
1007+
puts("Copyright (C) 2000-2006 MySQL AB");
10081008
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
10091009
puts("Administration program for the mysqld daemon.");
10101010
printf("Usage: %s [OPTIONS] command command....\n", my_progname);

‎client/mysqlimport.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2000 MySQL AB
1+
/* Copyright (C) 2000-2006 MySQL AB
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
@@ -183,7 +183,7 @@ static void print_version(void)
183183
static void usage(void)
184184
{
185185
print_version();
186-
puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB");
186+
puts("Copyright (C) 2000-2006 MySQL AB");
187187
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
188188
printf("\
189189
Loads tables from text files in various formats. The base name of the\n\

‎client/mysqlshow.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2000 MySQL AB
1+
/* Copyright (C) 2000-2006 MySQL AB
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
@@ -236,7 +236,7 @@ static void print_version(void)
236236
static void usage(void)
237237
{
238238
print_version();
239-
puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB");
239+
puts("Copyright (C) 2000-2006 MySQL AB");
240240
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
241241
puts("Shows the structure of a mysql database (databases,tables and columns)\n");
242242
printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname);

0 commit comments

Comments
 (0)