5.3 merge

9 files changed, 64 insertions, 11 deletions

diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index f402d8ec8ee..a6bf73ca0fe 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2006 MySQL AB
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates.
 # 
 # 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
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 0454654ad1d..f0b09cc3e77 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright (c) 2000-2008 MySQL AB, 2009, 2010 Sun Microsystems, Inc.
-# Copyright (C) 2002-2003 MySQL AB & Monty Program Ab
+# Copyright (c) 2009-2011 Monty Program Ab
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
diff --git a/scripts/mysql_secure_installation.pl.in b/scripts/mysql_secure_installation.pl.in
index 543b8d1b1c0..ca39420952b 100755
--- a/scripts/mysql_secure_installation.pl.in
+++ b/scripts/mysql_secure_installation.pl.in
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates
 #
 # 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
diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh
index d5ace68ea76..772a9d8b1d8 100644
--- a/scripts/mysql_secure_installation.sh
+++ b/scripts/mysql_secure_installation.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, Oracle and/or its affiliates
 # 
 # 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
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index c8e0aa7b435..2e97d2b8272 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -1,6 +1,7 @@
--- Copyright (C) 2008, 2011 Oracle and/or its affiliates.
--- Copyright (C) 2010, 2011 Monty Program Ab
---
+-- Copyright (c) 2007, 2008 MySQL AB, 2009 Sun Microsystems, Inc.
+-- Copyright (c) 2008-2011 Monty Program Ab
+-- Use is subject to license terms.
+-- 
 -- 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.
diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mysql_system_tables_data.sql
index a3b6f6cbfef..878555e9458 100644
--- a/scripts/mysql_system_tables_data.sql
+++ b/scripts/mysql_system_tables_data.sql
@@ -1,4 +1,5 @@
--- Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2007 MySQL AB, 2008 Sun Microsystems, Inc.
+-- Use is subject to license terms.
 -- 
 -- 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
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 9d2571b201f..02316d218e7 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -1,4 +1,21 @@
 #!/usr/bin/perl
+# Copyright (c) 2000, 2010, Oracle and/or its affiliates.
+# Copyright (c) 2000-2011 Monty Program Ab, Jani Tolonen
+#
+# 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 Library General Public
+# License along with this library; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
index b7fb73cf1dd..48aefbd8c49 100644
--- a/scripts/mysqlhotcopy.sh
+++ b/scripts/mysqlhotcopy.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, Oracle and/or its affiliates
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/scripts/mytop.sh b/scripts/mytop.sh
index 5c88cf580a4..7cec85e2136 100755
--- a/scripts/mytop.sh
+++ b/scripts/mytop.sh
@@ -830,6 +830,11 @@ sub GetData()
 
         %OLD_STATUS = %STATUS;
 
+	# Set some status that may not exist in all versions
+	$STATUS{Handler_tmp_write}= 0;
+	$STATUS{Handler_tmp_update}= 0;
+	$STATUS{Rows_tmp_read}= 0;
+
         foreach my $ref (@recs)
         {
             my $key = $ref->{Variable_name};
@@ -926,7 +931,7 @@ sub GetData()
         $lines_left--;
 
 
-        printf " Queries: %-6s  qps: %4.0f Slow: %7s         Se/In/Up/De(%%):    %02.0f/%02.0f/%02.0f/%02.0f \n",
+        printf " Queries: %-6s  qps: %4.0f Slow: %7s         Se/In/Up/De(%%):    %02.0f/%02.0f/%02.0f/%02.0f\n",
                make_short( $STATUS{Questions} ),  # q total
                $STATUS{Questions} / $STATUS{Uptime},  # qps, average
                make_short( $STATUS{Slow_queries} ),    # slow
@@ -944,7 +949,7 @@ sub GetData()
           my $q_diff = ( $STATUS{Questions} - $OLD_STATUS{Questions} );
 #          print("q_diff: $STATUS{Questions} - $OLD_STATUS{Questions}  / $t_delta = $q_diff\n");
 
-          printf(" Sorts: %5.0f qps now: %4.0f Slow qps: %3.1f  Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f \n",
+          printf(" Sorts: %5.0f qps now: %4.0f Slow qps: %3.1f  Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f\n",
 		 ( $STATUS{Sort_rows} - $OLD_STATUS{Sort_rows} ) / $t_delta, 
                  ( $STATUS{Questions} - $OLD_STATUS{Questions} ) / $t_delta,
                  ( # slow now (qps)
@@ -1014,6 +1019,35 @@ sub GetData()
         }
         $lines_left--;
 
+        if ($t_delta)
+	{
+	  printf(" Handler: (R/W/U/D) %5d/%5d/%5d/%5d        Tmp: R/W/U: %5d/%5d/%5d\n",
+		 ($STATUS{Handler_read_first}+$STATUS{Handler_read_key}+
+		 $STATUS{Handler_read_next}+$STATUS{Handler_read_prev}+
+		 $STATUS{Handler_read_rnd}+$STATUS{Handler_read_rnd_next} -
+		 $OLD_STATUS{Handler_read_first}-$OLD_STATUS{Handler_read_key}-
+		 $OLD_STATUS{Handler_read_next}-$OLD_STATUS{Handler_read_prev}-
+		 $OLD_STATUS{Handler_read_rnd}-
+		 $OLD_STATUS{Handler_read_rnd_next})/$t_delta,
+		 ($STATUS{Handler_write} - $OLD_STATUS{Handler_write}) /
+		 $t_delta,
+		 ($STATUS{Handler_update} - $OLD_STATUS{Handler_update}) /
+		 $t_delta,
+		 ($STATUS{Handler_delete} - $OLD_STATUS{Handler_delete}) / 
+		 $t_delta,
+		 ($STATUS{Rows_tmp_read} - $OLD_STATUS{Rows_tmp_read}) /
+		 $t_delta,
+		 ($STATUS{Handler_tmp_write} 
+		  -$OLD_STATUS{Handler_tmp_write})/$t_delta,
+		 ($STATUS{Handler_tmp_update} -
+		  $OLD_STATUS{Handler_tmp_update})/$t_delta);
+	}
+	else
+        {
+            print "\n";
+        }
+
+	$lines_left--;
 
         printf(" MyISAM Key Efficiency: %2.1f%%  Bps in/out: %5s/%5s   ",
                $cache_hits_percent,