Merge from maria/5.5 (-rtag:mariadb-5.5.36).

9 files changed, 25 insertions, 25 deletions

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 08bdd417fe3..c6c4cb1c5e8 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
diff --git a/scripts/comp_sql.c b/scripts/comp_sql.c
index 2c74cc49aae..ef028e8e7bc 100644
--- a/scripts/comp_sql.c
+++ b/scripts/comp_sql.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 2007 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
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 69d20575212..3903140b227 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
@@ -537,7 +537,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",
            "",
@@ -570,8 +570,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 10038d2cf58..6237a6fbedc 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
@@ -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"
@@ -436,7 +436,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
@@ -454,8 +454,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
 
@@ -506,7 +507,7 @@ 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:"
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index 837f1177430..e9b54f24668 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -1,7 +1,6 @@
--- Copyright (c) 2007, 2008 MySQL AB, 2009 Sun Microsystems, Inc.
--- Copyright (c) 2008-2011 Monty Program Ab
--- Use is subject to license terms.
--- 
+-- Copyright (c) 2007, 2013, Oracle and/or its affiliates.
+-- Copyright (c) 2008, 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
 -- the Free Software Foundation; version 2 of the License.
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index 2860cb1f8de..20df3966ba2 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, 2011 Monty Program 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
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"