From: Bjorn Munch Date: January 19 2011 11:55am Subject: bzr commit into mysql-5.1 branch (bjorn.munch:3561) List-Archive: http://lists.mysql.com/commits/129171 Message-Id: <201101191155.p0JBtnOl005709@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/bm136801/my/tomain-51/ based on revid:anders.song@stripped 3561 Bjorn Munch 2011-01-19 [merge] merge from 5.1-mtr modified: client/mysqltest.cc mysql-test/Makefile.am mysql-test/include/rpl_start_server.inc mysql-test/include/rpl_stop_server.inc mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/File/Path.pm mysql-test/lib/My/Find.pm mysql-test/lib/My/Options.pm mysql-test/lib/My/Platform.pm mysql-test/lib/My/SafeProcess.pm mysql-test/lib/My/SafeProcess/Base.pm mysql-test/lib/My/SafeProcess/CMakeLists.txt mysql-test/lib/My/SafeProcess/Makefile.am mysql-test/lib/My/SafeProcess/safe_kill_win.cc mysql-test/lib/My/SafeProcess/safe_process.cc mysql-test/lib/My/SafeProcess/safe_process_win.cc mysql-test/lib/My/SysInfo.pm mysql-test/lib/My/Test.pm mysql-test/lib/mtr_gcov.pl mysql-test/lib/mtr_gprof.pl mysql-test/lib/mtr_io.pl mysql-test/lib/mtr_match.pm mysql-test/lib/mtr_misc.pl mysql-test/lib/mtr_report.pm mysql-test/lib/mtr_stress.pl mysql-test/lib/mtr_unique.pm mysql-test/mysql-stress-test.pl mysql-test/mysql-test-run.pl mysql-test/valgrind.supp === modified file 'client/mysqltest.cc' --- a/client/mysqltest.cc 2011-01-11 09:54:42 +0000 +++ b/client/mysqltest.cc 2011-01-18 10:03:44 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 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 @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* mysqltest === modified file 'mysql-test/Makefile.am' --- a/mysql-test/Makefile.am 2010-12-28 23:47:05 +0000 +++ b/mysql-test/Makefile.am 2011-01-18 10:03:44 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2006 MySQL AB +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -10,10 +10,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Library General Public License for more details. # -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -# MA 02111-1307, USA +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Process this file with automake to create Makefile.in === modified file 'mysql-test/include/rpl_start_server.inc' --- a/mysql-test/include/rpl_start_server.inc 2011-01-14 10:33:12 +0000 +++ b/mysql-test/include/rpl_start_server.inc 2011-01-18 11:25:07 +0000 @@ -45,15 +45,7 @@ if ($rpl_server_parameters) --source include/rpl_connection.inc # Write file to make mysql-test-run.pl start up the server again ---let WRITE_TO_FILE= $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect ---let WRITE_TO_VAR= $_rpl_start_server_command -perl; -my $file= $ENV{'WRITE_TO_FILE'}; -my $var= $ENV{'WRITE_TO_VAR'}; -open WRITE_FILE, ">> $file" or die "Error opening $file: $!"; -print WRITE_FILE $var, "\n" or die "Error appending to $file: $!"; -close WRITE_FILE or die "Error closing $file: $!"; -EOF +--exec echo "$_rpl_start_server_command" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect --source include/rpl_reconnect.inc === modified file 'mysql-test/include/rpl_stop_server.inc' --- a/mysql-test/include/rpl_stop_server.inc 2011-01-14 10:33:12 +0000 +++ b/mysql-test/include/rpl_stop_server.inc 2011-01-18 11:25:07 +0000 @@ -44,9 +44,7 @@ if ($rpl_debug) # Write file to make mysql-test-run.pl expect the "crash", but don't start # it until it's told to ---append_file $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect -wait -EOF +--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect # Send shutdown to the connected server and give # it 10 seconds to die before zapping it === modified file 'mysql-test/lib/My/ConfigFactory.pm' --- a/mysql-test/lib/My/ConfigFactory.pm 2010-06-15 09:16:38 +0000 +++ b/mysql-test/lib/My/ConfigFactory.pm 2011-01-18 10:03:44 +0000 @@ -1,4 +1,20 @@ # -*- cperl -*- +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by 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 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + package My::ConfigFactory; use strict; === modified file 'mysql-test/lib/My/CoreDump.pm' --- a/mysql-test/lib/My/CoreDump.pm 2009-03-24 13:44:21 +0000 +++ b/mysql-test/lib/My/CoreDump.pm 2011-01-18 10:03:44 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc. # # 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 === modified file 'mysql-test/lib/My/File/Path.pm' --- a/mysql-test/lib/My/File/Path.pm 2009-04-01 14:23:10 +0000 +++ b/mysql-test/lib/My/File/Path.pm 2011-01-18 10:03:44 +0000 @@ -1,4 +1,19 @@ # -*- cperl -*- +# Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc. +# +# 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; 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 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + package My::File::Path; use strict; === modified file 'mysql-test/lib/My/Find.pm' --- a/mysql-test/lib/My/Find.pm 2008-09-20 13:51:31 +0000 +++ b/mysql-test/lib/My/Find.pm 2011-01-18 10:03:44 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (C) 2008 MySQL AB # # 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 === modified file 'mysql-test/lib/My/Options.pm' --- a/mysql-test/lib/My/Options.pm 2008-04-24 11:02:53 +0000 +++ b/mysql-test/lib/My/Options.pm 2011-01-18 10:03:44 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (C) 2008 MySQL AB # # 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 === modified file 'mysql-test/lib/My/Platform.pm' --- a/mysql-test/lib/My/Platform.pm 2009-08-06 07:30:53 +0000 +++ b/mysql-test/lib/My/Platform.pm 2011-01-18 10:03:44 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc. # # 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 === modified file 'mysql-test/lib/My/SafeProcess.pm' --- a/mysql-test/lib/My/SafeProcess.pm 2010-03-16 09:45:32 +0000 +++ b/mysql-test/lib/My/SafeProcess.pm 2011-01-18 10:03:44 +0000 @@ -1,14 +1,15 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # -# 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; version 2 of the License. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by 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 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software === modified file 'mysql-test/lib/My/SafeProcess/Base.pm' --- a/mysql-test/lib/My/SafeProcess/Base.pm 2009-04-23 11:35:02 +0000 +++ b/mysql-test/lib/My/SafeProcess/Base.pm 2011-01-18 10:03:44 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc. # # 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 === modified file 'mysql-test/lib/My/SafeProcess/CMakeLists.txt' --- a/mysql-test/lib/My/SafeProcess/CMakeLists.txt 2007-12-19 11:58:06 +0000 +++ b/mysql-test/lib/My/SafeProcess/CMakeLists.txt 2011-01-18 10:03:44 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2006 MySQL AB +# Copyright (C) 2008 MySQL AB # # 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 === modified file 'mysql-test/lib/My/SafeProcess/Makefile.am' --- a/mysql-test/lib/My/SafeProcess/Makefile.am 2009-10-13 18:21:42 +0000 +++ b/mysql-test/lib/My/SafeProcess/Makefile.am 2011-01-18 10:03:44 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2006 MySQL AB +# Copyright (C) 2008 MySQL AB # # 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 === modified file 'mysql-test/lib/My/SafeProcess/safe_kill_win.cc' --- a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc 2009-09-29 22:19:00 +0000 +++ b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc 2011-01-18 10:03:44 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 MySQL AB +/* Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc. 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 === modified file 'mysql-test/lib/My/SafeProcess/safe_process.cc' --- a/mysql-test/lib/My/SafeProcess/safe_process.cc 2010-07-02 18:30:47 +0000 +++ b/mysql-test/lib/My/SafeProcess/safe_process.cc 2011-01-18 10:03:44 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 MySQL AB +/* Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc. 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 === modified file 'mysql-test/lib/My/SafeProcess/safe_process_win.cc' --- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc 2010-01-19 08:48:56 +0000 +++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc 2011-01-18 10:03:44 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 MySQL AB +/* Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc. 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 === modified file 'mysql-test/lib/My/SysInfo.pm' --- a/mysql-test/lib/My/SysInfo.pm 2008-10-11 15:30:26 +0000 +++ b/mysql-test/lib/My/SysInfo.pm 2011-01-18 10:03:44 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (C) 2008 MySQL AB # # 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 === modified file 'mysql-test/lib/My/Test.pm' --- a/mysql-test/lib/My/Test.pm 2008-11-14 10:49:12 +0000 +++ b/mysql-test/lib/My/Test.pm 2011-01-18 10:03:44 +0000 @@ -1,4 +1,18 @@ # -*- cperl -*- +# Copyright (C) 2008 MySQL AB +# +# 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; 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 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # === modified file 'mysql-test/lib/mtr_gcov.pl' --- a/mysql-test/lib/mtr_gcov.pl 2009-02-27 11:20:53 +0000 +++ b/mysql-test/lib/mtr_gcov.pl 2011-01-18 11:01:40 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004, 2006 MySQL AB +# Copyright (C) 2004, 2006 MySQL AB, 2009 Sun Microsystems, Inc. # # 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 === modified file 'mysql-test/lib/mtr_gprof.pl' --- a/mysql-test/lib/mtr_gprof.pl 2010-01-05 20:35:50 +0000 +++ b/mysql-test/lib/mtr_gprof.pl 2011-01-18 11:11:52 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004 MySQL AB +# Copyright (C) 2004 MySQL AB, 2009 Sun Microsystems, Inc. # # 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 === modified file 'mysql-test/lib/mtr_io.pl' --- a/mysql-test/lib/mtr_io.pl 2008-11-14 20:35:32 +0000 +++ b/mysql-test/lib/mtr_io.pl 2011-01-18 11:01:40 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (C) 2004-2007 MySQL AB, 2008 Sun Microsystems, Inc. # # 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 === modified file 'mysql-test/lib/mtr_match.pm' --- a/mysql-test/lib/mtr_match.pm 2008-04-08 14:51:26 +0000 +++ b/mysql-test/lib/mtr_match.pm 2011-01-18 11:01:40 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (C) 2004-2008 MySQL AB # # 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 === modified file 'mysql-test/lib/mtr_misc.pl' --- a/mysql-test/lib/mtr_misc.pl 2010-06-03 08:31:26 +0000 +++ b/mysql-test/lib/mtr_misc.pl 2011-01-18 10:03:44 +0000 @@ -1,15 +1,16 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB -# -# 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; version 2 of the License. -# +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by 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 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA === modified file 'mysql-test/lib/mtr_report.pm' --- a/mysql-test/lib/mtr_report.pm 2011-01-11 09:53:22 +0000 +++ b/mysql-test/lib/mtr_report.pm 2011-01-18 10:03:44 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright 2004-2008 MySQL AB, 2008 Sun Microsystems, Inc. +# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. # # 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 === modified file 'mysql-test/lib/mtr_stress.pl' --- a/mysql-test/lib/mtr_stress.pl 2009-11-19 12:19:11 +0000 +++ b/mysql-test/lib/mtr_stress.pl 2011-01-18 11:01:40 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2006 MySQL AB +# Copyright (C) 2004-2007 MySQL AB, 2009 Sun Microsystems, Inc. # # 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 === modified file 'mysql-test/lib/mtr_unique.pm' --- a/mysql-test/lib/mtr_unique.pm 2009-04-23 11:35:02 +0000 +++ b/mysql-test/lib/mtr_unique.pm 2011-01-18 11:01:40 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2006 MySQL AB +# Copyright (C) 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc. # # 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 === modified file 'mysql-test/mysql-stress-test.pl' --- a/mysql-test/mysql-stress-test.pl 2010-12-28 23:47:05 +0000 +++ b/mysql-test/mysql-stress-test.pl 2011-01-18 10:03:44 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2005, 2006 MySQL AB +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -12,10 +12,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Library General Public License for more details. # -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -# MA 02111-1307, USA +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # ====================================================================== # MySQL server stress test system === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2010-12-29 15:01:07 +0000 +++ b/mysql-test/mysql-test-run.pl 2011-01-18 10:03:44 +0000 @@ -13,10 +13,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Library General Public License for more details. # -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -# MA 02111-1307, USA +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## === modified file 'mysql-test/valgrind.supp' --- a/mysql-test/valgrind.supp 2010-12-28 23:47:05 +0000 +++ b/mysql-test/valgrind.supp 2011-01-18 10:03:44 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2005, 2008 MySQL AB +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -10,10 +10,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Library General Public License for more details. # -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -# MA 02111-1307, USA +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # # Suppress some common (not fatal) errors in system libraries found by valgrind No bundle (reason: revision is a merge).