* bzr merge -rtag:mariadb-10.0.9 maria/10.0

* Fix for post-merge build failures.

11 files changed, 42 insertions, 33 deletions

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 20a9bd46696..af11b759f4e 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, 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
@@ -172,6 +172,10 @@ ENDIF()
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysqlbug.sh
   ${CMAKE_CURRENT_BINARY_DIR}/mysqlbug ESCAPE_QUOTES @ONLY)
+  EXECUTE_PROCESS(
+  COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mysqlbug
+  )
+
 INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/mysqlbug
   DESTINATION ${INSTALL_BINDIR}
   COMPONENT Server
@@ -205,6 +209,10 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
   SET(DEST ${INSTALL_SCRIPTDIR})
   SET(EXT)
+  EXECUTE_PROCESS(
+  COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db
+  )
+
 INSTALL_SCRIPT(
  "${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db"
   DESTINATION ${DEST}
@@ -212,7 +220,6 @@ INSTALL_SCRIPT(
   )
 ENDIF()
 
-
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
 SET(sysconfdir ${prefix})
 SET(bindir ${prefix}/${INSTALL_BINDIR})
diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in
index acf33699b05..b39bf146f58 100644
--- a/scripts/mysql_config.pl.in
+++ b/scripts/mysql_config.pl.in
@@ -258,7 +258,7 @@ Options:
         --version        [$version]
         --libmysqld-libs [$embedded_libs]
 EOF
-  exit 1;
+  exit 0;
 }
 
 @ARGV or usage();
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 38cd2b6b910..81b2e96fbd9 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -176,7 +176,7 @@ Options:
                 pkglibdir     [$pkglibdir]
                 plugindir     [$plugindir]
 EOF
-        exit 1
+        exit 0
 }
 
 if test $# -le 0; then usage; fi
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
index 1bc2603a718..e63e8646d07 100644
--- a/scripts/mysql_install_db.pl.in
+++ b/scripts/mysql_install_db.pl.in
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates.
+# Copyright (c) 2007, 2013, 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
@@ -535,7 +535,7 @@ if ( open(PIPE, "| $mysqld_install_cmd_line") )
              "  cd mysql-test ; perl mysql-test-run.pl");
     }
     report($opt,
-           "Please report any problems with the " . '@scriptdir@' . "/mysqlbug script!",
+           "Please report any problems at http://bugs.mysql.com/",
            "",
            "The latest information about MySQL is available on the web at",
            "",
@@ -568,8 +568,9 @@ else
         "Please consult the MySQL manual section: 'Problems running mysql_install_db',",
         "and the manual section that describes problems on your OS.",
         "Another information source is the MySQL email archive.",
-        "Please check all of the above before mailing us!",
-        "And if you do mail us, you MUST use the " . '@scriptdir@' . "/mysqlbug script!")
+        "",
+        "Please check all of the above before submitting a bug report",
+        "at http://bugs.mysql.com/")
 }
 
 ##############################################################################
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 1870dc8b32f..c24aacaf883 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates.
-# Copyright (c) 2009, 2011,2013 Monty Program Ab
+# Copyright (c) 2000, 2013, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2013, Monty Program 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
@@ -90,7 +90,7 @@ link_to_help()
 {
   echo
   echo "The latest information about mysql_install_db is available at"
-  echo "http://kb.askmonty.org/v/installing-system-tables-mysql_install_db."
+  echo "https://mariadb.com/kb/en/installing-system-tables-mysql_install_db"
 }
 
 parse_arg()
@@ -267,7 +267,7 @@ then
   bindir="$basedir/client"
   extra_bindir="$basedir/extra"
   mysqld="$basedir/sql/mysqld"
-  langdir="$srcdir/sql/share/english"
+  langdir="$basedir/sql/share/english"
   pkgdatadir="$srcdir/scripts"
   scriptdir="$srcdir/scripts"
 elif test -n "$basedir"
@@ -435,7 +435,7 @@ else
   echo "The problem could be conflicting information in an external"
   echo "my.cnf files. You can ignore these by doing:"
   echo
-  echo "    shell> /scripts/mysql_install_db --defaults-file=~/.my.cnf"
+  echo "    shell> $scriptdir/scripts/mysql_install_db --defaults-file=~/.my.cnf"
   echo
   echo "You can also try to start the mysqld daemon with:"
   echo
@@ -453,8 +453,9 @@ else
   echo "MariaDB is hosted on launchpad; You can find the latest source and"
   echo "email lists at http://launchpad.net/maria"
   echo
-  echo "Please check all of the above before mailing us!  And remember, if"
-  echo "you do mail us, you should use the $scriptdir/mysqlbug script!"
+  echo "Please check all of the above before submitting a bug report"
+  echo "at http://mariadb.org/jira"
+  echo
   exit 1
 fi
 
@@ -491,7 +492,7 @@ then
   echo "databases and anonymous user created by default.  This is"
   echo "strongly recommended for production servers."
   echo
-  echo "See the MariaDB Knowledgebase at http://kb.askmonty.org or the"
+  echo "See the MariaDB Knowledgebase at http://mariadb.com/kb or the"
   echo "MySQL manual for more instructions."
 
   if test "$in_rpm" -eq 0
@@ -505,15 +506,15 @@ then
   fi
 
   echo
-  echo "Please report any problems with the '$scriptdir/mysqlbug' script!"
+  echo "Please report any problems at http://mariadb.org/jira"
   echo
   echo "The latest information about MariaDB is available at http://mariadb.org/."
   echo "You can find additional information about the MySQL part at:"
   echo "http://dev.mysql.com"
   echo "Support MariaDB development by buying support/new features from"
-  echo "Monty Program Ab. You can contact us about this at sales@montyprogram.com".
+  echo "SkySQL Ab. You can contact us about this at sales@skysql.com".
   echo "Alternatively consider joining our community based development effort:"
-  echo "http://kb.askmonty.org/en/contributing-to-the-mariadb-project/"
+  echo "http://mariadb.com/kb/en/contributing-to-the-mariadb-project/"
   echo
 fi
 
diff --git a/scripts/mysql_secure_installation.pl.in b/scripts/mysql_secure_installation.pl.in
index 188a6bd7104..188a6bd7104 100755..100644
--- a/scripts/mysql_secure_installation.pl.in
+++ b/scripts/mysql_secure_installation.pl.in
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index 79eeee2ac2c..34742aa6dfb 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -1,6 +1,5 @@
--- Copyright (c) 2007, 2011, Oracle and/or its affiliates.
--- Copyright (c) 2007, 2008 MySQL AB, 2009 Sun Microsystems, Inc.
--- Copyright (c) 2008-2013 Monty Program Ab & SkySQL Ab
+-- Copyright (c) 2007, 2013, Oracle and/or its affiliates.
+-- Copyright (c) 2008, 2014, Monty Program Ab & SkySQL 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
diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mysql_system_tables_data.sql
index beb99af8e90..38e6a547c1d 100644
--- a/scripts/mysql_system_tables_data.sql
+++ b/scripts/mysql_system_tables_data.sql
@@ -24,8 +24,7 @@
 -- Get the hostname, if the hostname has any wildcard character like "_" or "%" 
 -- add escape character in front of wildcard character to convert "_" or "%" to
 -- a plain character
-SET @get_hostname= @@hostname;
-SELECT REPLACE((SELECT REPLACE(@get_hostname,'_','\_')),'%','\%') INTO @current_hostname;
+SELECT LOWER( REPLACE((SELECT REPLACE(@@hostname,'_','\_')),'%','\%') )INTO @current_hostname;
 
 
 -- Fill "db" table with default grants for anyone to
@@ -41,16 +40,16 @@ DROP TABLE tmp_db;
 -- from local machine if "user" table didn't exist before
 CREATE TEMPORARY TABLE tmp_user LIKE user;
 INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N', 'N');
-REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N' FROM dual WHERE LOWER( @current_hostname) != 'localhost';
+REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N' FROM dual WHERE @current_hostname != 'localhost';
 REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N');
 REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N');
 INSERT INTO tmp_user (host,user) VALUES ('localhost','');
-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
+INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
 INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
 DROP TABLE tmp_user;
 
 CREATE TEMPORARY TABLE tmp_proxies_priv LIKE proxies_priv;
 INSERT INTO tmp_proxies_priv VALUES ('localhost', 'root', '', '', TRUE, '', now());
-REPLACE INTO tmp_proxies_priv SELECT @current_hostname, 'root', '', '', TRUE, '', now() FROM DUAL WHERE LOWER (@current_hostname) != 'localhost';
+REPLACE INTO tmp_proxies_priv SELECT @current_hostname, 'root', '', '', TRUE, '', now() FROM DUAL WHERE @current_hostname != 'localhost';
 INSERT INTO  proxies_priv SELECT * FROM tmp_proxies_priv WHERE @had_proxies_priv_table=0;
 DROP TABLE tmp_proxies_priv;
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index f444df60a83..45c862e1420 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -1,5 +1,5 @@
--- Copyright (C) 2003, 2011 Oracle and/or its affiliates.
--- Copyright (C) 2010-2013 Monty Program Ab & SkySQL Ab
+-- Copyright (C) 2003, 2013 Oracle and/or its affiliates.
+-- Copyright (C) 2010, 2014 SkySQL 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
@@ -645,6 +645,9 @@ INSERT INTO tmp_proxies_priv VALUES ('localhost', 'root', '', '', TRUE, '', now(
 INSERT INTO proxies_priv SELECT * FROM tmp_proxies_priv WHERE @had_proxies_priv_table=0;
 DROP TABLE tmp_proxies_priv;
 
+# Convering the host name to lower case for existing users
+UPDATE user SET host=LOWER( host ) WHERE LOWER( host ) <> host;
+
 # MDEV-4332 longer user names
 alter table user         modify User         char(80)  binary not null default '';
 alter table db           modify User         char(80)  binary not null default '';
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index 43844e5ec68..1d01c84735a 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2000, 2007 MySQL AB, 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2000, 2013, 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
@@ -2423,7 +2422,7 @@ sub Print_Header {
 sub Print_Footer {
     if ($MySQLaccess::CMD) { #command-line mode
     print "\n"
-         ."BUGs can be reported trough https://mariadb.atlassian.net/browse/MDEV\n";
+         ."BUGs can be reported at https://mariadb.atlassian.net/browse/MDEV\n";
     }
     if ($MySQLaccess::CGI) { #CGI-BIN mode
     if ($MySQLaccess::Param{'brief'}) {
@@ -2431,7 +2430,7 @@ sub Print_Footer {
     }
     print "<HR>\n"
          ."<ADDRESS>\n"
-         ."BUGs can be reported through <a href=\"https://mariadb.atlassian.net/browse/MDEV\">MariaDB JIRA</a><BR>\n"
+         ."BUGs can be reported at <a href=\"https://mariadb.atlassian.net/browse/MDEV\">MariaDB JIRA</a><BR>\n"
 #         ."Don't forget to mention the version $VERSION!<BR>\n"
          ."</ADDRESS>\n"
          ."</BODY>\n"
diff --git a/scripts/mytop.sh b/scripts/mytop.sh
index 480805e90b1..480805e90b1 100755..100644
--- a/scripts/mytop.sh
+++ b/scripts/mytop.sh