Manual merge from mysql-trunk.

Conflicts:
  - mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result

scripts/CMakeLists.txt

@@ -261,7 +261,7 @@ IF(WIN32)
   SET(PLIN_FILES mysql_config mysql_secure_installation)
   # Input files with .sh extension
 
-  SET(SH_FILES mysql_convert_table_format mysqld_multi mysqldumpslow 
+  SET(SH_FILES mysql_convert_table_format mysqld_multi mysqldumpslow
     mysqlhotcopy)
 
   FOREACH(file ${PLIN_FILES})

scripts/make_win_bin_dist

@@ -249,6 +249,7 @@ cp include/mysql.h \
    include/decimal.h \
    include/errmsg.h \
    include/my_global.h \
+   include/my_config.h \
    include/my_net.h \
    include/my_getopt.h \
    include/sslopt-longopts.h \
@@ -395,15 +396,15 @@ cp scripts/*.sql $DESTDIR/share/
 # Clean up from possibly copied SCCS directories
 # ----------------------------------------------------------------------
 
-rm -rf `find $DISTDIR -type d -name SCCS -print`
+rm -rf `find $DESTDIR -type d -name SCCS -print`
 
 # ----------------------------------------------------------------------
 # Copy other files specified on command line DEST=SOURCE
 # ----------------------------------------------------------------------
 
 for arg do
-  dst=`echo $arg | sed 's/=.*$//'`
-  src=`echo $arg | sed 's/^.*=//'`
+  dst=`echo $arg | sed -n 's/=.*$//p'`
+  src=`echo $arg | sed -n 's/^.*=//p'`
 
   if [ x"$dst" = x"" -o x"$src" = x"" ] ; then
     echo "Invalid specification of what to copy"

scripts/mysql_system_tables.sql

@@ -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
 
 --
 -- The system tables of MySQL Server
@@ -160,26 +160,6 @@ PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
 
---
--- Unlike 'performance_schema', the 'mysql' database is reserved already,
--- so no user procedure is supposed to be there
---
-drop procedure if exists mysql.die;
-create procedure mysql.die() signal sqlstate 'HY000' set message_text='Unexpected content found in the performance_schema database.';
-
---
--- For broken upgrades, SIGNAL the error
---
-
-SET @cmd="call mysql.die()";
-
-SET @str = IF(@broken_pfs > 0, @cmd, 'SET @dummy = 0');
-PREPARE stmt FROM @str;
-EXECUTE stmt;
-DROP PREPARE stmt;
-
-drop procedure mysql.die;
-
 --
 -- From this point, only create the performance schema tables
 -- if the server is build with performance schema

scripts/mysql_system_tables_fix.sql

@@ -1,3 +1,18 @@
+-- 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 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
+
 # This part converts any old privilege tables to privilege tables suitable
 # for current version of MySQL
 
@@ -604,6 +619,29 @@ ALTER TABLE user MODIFY Create_tablespace_priv enum('N','Y') COLLATE utf8_genera
 
 UPDATE user SET Create_tablespace_priv = Super_priv WHERE @hadCreateTablespacePriv = 0;
 
+--
+-- Unlike 'performance_schema', the 'mysql' database is reserved already,
+-- so no user procedure is supposed to be there.
+--
+-- NOTE: until upgrade is finished, stored routines are not available,
+-- because system tables (e.g. mysql.proc) might be not usable.
+--
+drop procedure if exists mysql.die;
+create procedure mysql.die() signal sqlstate 'HY000' set message_text='Unexpected content found in the performance_schema database.';
+
+--
+-- For broken upgrades, SIGNAL the error
+--
+
+SET @cmd="call mysql.die()";
+
+SET @str = IF(@broken_pfs > 0, @cmd, 'SET @dummy = 0');
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
+drop procedure mysql.die;
+
 # Activate the new, possible modified privilege tables
 # This should not be needed, but gives us some extra testing that the above
 # changes was correct