Merge branch '10.1' of bzr::/usr/home/serg/Abk/mysql into 10.1

.bzrignore

@@ -1436,7 +1436,7 @@ storage/tokudb/ft-index/portability/tests/try-uninit
 storage/tokudb/ft-index/src/merge_archives_tokufractaltree_static.cmake
 storage/tokudb/ft-index/src/tokufractaltree_static_depends.cc
 storage/tokudb/ft-index/src/tests/recovery_fileops_unit_dir
-storage/tokudb/ft-index/toku_include/toku_config.h
+storage/tokudb/ft-index/portability/toku_config.h
 storage/tokudb/ft-index/util/tests/marked-omt-test
 storage/tokudb/ft-index/util/tests/omt-tmpl-test
 storage/tokudb/ft-index/util/tests/sort-tmpl-test
@@ -1450,9 +1450,10 @@ storage/tokudb/ft-index/util/tests/test_partitioned_counter
 storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833
 storage/tokudb/ft-index/util/tests/threadpool-test
 storage/tokudb/ft-index/util/tests/threadpool-testrunf
-storage/tokudb/ft-index/utils/tokudb_dump
-storage/tokudb/ft-index/utils/tokudb_gen
-storage/tokudb/ft-index/utils/tokudb_load
+storage/tokudb/ft-index/tools/tokudb_dump
+storage/tokudb/ft-index/tools/tokudb_gen
+storage/tokudb/ft-index/tools/tokudb_load
 storage/connect/connect.cnf
 storage/cassandra/cassandra.cnf
 libmysql/libmysql_versions.ld
+scripts/mysql_config.pl

BUILD/cleanup

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2003 MySQL 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.

BUILD/compile-alpha

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2000, 2002 MySQL 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.

BUILD/compile-amd64-debug-max-no-ndb

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2005, 2006 MySQL 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 Library General Public
 # License as published by the Free Software Foundation; version 2

BUILD/compile-amd64-gcov

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2007 MySQL 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.

BUILD/compile-amd64-gprof

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2007 MySQL 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.

BUILD/compile-amd64-max-sci

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2007 MySQL 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.

BUILD/compile-pentium-cybozu

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2005 MySQL 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.

BUILD/compile-pentium-gcov

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2000, 2007 MySQL 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.

BUILD/compile-pentium-gprof

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2001, 2007 MySQL 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.

BUILD/compile-pentium-icc

@@ -1,7 +1,8 @@
 #! /bin/sh
 
 # Copyright (C) 2005 MySQL 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.

BUILD/compile-pentium-icc-yassl

@@ -1,7 +1,8 @@
 #! /bin/sh
 
 # Copyright (C) 2005 MySQL 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.

BUILD/compile-pentium-myodbc

@@ -1,7 +1,8 @@
 #! /bin/sh
 
 # Copyright (C) 2000 MySQL 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.

BUILD/compile-pentium64-gcov

@@ -1,6 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2007 MySQL 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

BUILD/compile-pentium64-gprof

@@ -1,6 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2007 MySQL 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

BUILD/compile-pentium64-max

@@ -1,6 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2007 MySQL 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 Library General Public

BUILD/compile-pentium64-max-sci

@@ -1,7 +1,8 @@
 #! /bin/sh
 
 # Copyright (C) 2007 MySQL 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.

BUILD/compile-ppc

@@ -1,7 +1,8 @@
 #! /bin/sh
 
 # Copyright (C) 2004 MySQL 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.

BUILD/compile-solaris-amd64-debug

@@ -1,7 +1,8 @@
 #!/bin/sh
 
 # Copyright (C) 2007 MySQL 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.

CMakeLists.txt

@@ -1,5 +1,5 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates.
-# Copyright (c) 2008, 2013, Monty Program Ab
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates.
+# Copyright (c) 2008, 2014, 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
@@ -331,14 +331,15 @@ IF(INSTALL_SYSCONFDIR)
   SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}")
 ENDIF()
 
-OPTION(TMPDIR
-"PATH to MySQL TMP dir. If unspecified, defaults to P_tmpdir in <stdio.h>" OFF)
-IF(TMPDIR)
+SET(TMPDIR ""
+  CACHE PATH
+  "PATH to MySQL TMP dir. Defaults to the P_tmpdir macro in <stdio.h>")
+IF(TMPDIR STREQUAL "")
+  # Do not quote it, to refer to the P_tmpdir macro.
+  SET(DEFAULT_TMPDIR "P_tmpdir")
+ELSE()
   # Quote it, to make it a const char string.
   SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
-ELSE()
-  # Do not quote it, to refer to the P_tmpdir macro in <stdio.h>.
-  SET(DEFAULT_TMPDIR "P_tmpdir")
 ENDIF()
 
 # Run platform tests
@@ -387,11 +388,13 @@ IF(WITH_UNIT_TESTS)
  ADD_SUBDIRECTORY(unittest/examples)
  ADD_SUBDIRECTORY(unittest/mysys)
  ADD_SUBDIRECTORY(unittest/my_decimal)
- ADD_SUBDIRECTORY(unittest/sql)
+ IF(NOT WITHOUT_SERVER)
+   ADD_SUBDIRECTORY(unittest/sql)
+ ENDIF()
 ENDIF()
 
 IF(NOT WITHOUT_SERVER)
-SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
+ SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
 ENDIF()

client/mysql.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates.
    Copyright (c) 2009, 2013, Monty Program Ab.
    Copyright (c) 2013, 2014, SkySQL Ab
 

client/mysql_upgrade.c

@@ -500,6 +500,7 @@ static void find_tool(char *tool_executable_name, const char *tool_name,
   */
   if (run_tool(tool_executable_name,
                &ds_tmp, /* Get output from command, discard*/
+               "--no-defaults",
                "--help",
                "2>&1",
                IF_WIN("> NUL", "> /dev/null"),

client/mysqldump.c

@@ -604,12 +604,12 @@ static void print_version(void)
 } /* print_version */
 
 
-static void short_usage_sub(void)
+static void short_usage_sub(FILE *f)
 {
-  printf("Usage: %s [OPTIONS] database [tables]\n", my_progname_short);
-  printf("OR     %s [OPTIONS] --databases [OPTIONS] DB1 [DB2 DB3...]\n",
-         my_progname_short);
-  printf("OR     %s [OPTIONS] --all-databases [OPTIONS]\n", my_progname_short);
+  fprintf(f, "Usage: %s [OPTIONS] database [tables]\n", my_progname_short);
+  fprintf(f, "OR     %s [OPTIONS] --databases [OPTIONS] DB1 [DB2 DB3...]\n",
+          my_progname_short);
+  fprintf(f, "OR     %s [OPTIONS] --all-databases [OPTIONS]\n", my_progname_short);
 }
 
 
@@ -618,18 +618,18 @@ static void usage(void)
   print_version();
   puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
   puts("Dumping structure and contents of MySQL databases and tables.");
-  short_usage_sub();
+  short_usage_sub(stdout);
   print_defaults("my",load_default_groups);
   puts("");
-my_print_help(my_long_options);
+  my_print_help(my_long_options);
   my_print_variables(my_long_options);
 } /* usage */
 
 
-static void short_usage(void)
+static void short_usage(FILE *f)
 {
-  short_usage_sub();
-  printf("For more options, use %s --help\n", my_progname_short);
+  short_usage_sub(f);
+  fprintf(f, "For more options, use %s --help\n", my_progname_short);
 }
 
 
@@ -1002,7 +1002,7 @@ static int get_options(int *argc, char ***argv)
     exit(1);
   if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs))
   {
-    short_usage();
+    short_usage(stderr);
     return EX_USAGE;
   }
   if (tty_password)
@@ -1502,12 +1502,13 @@ static void free_resources()
 
 static void maybe_exit(int error)
 {
-  if (opt_slave_data)
-    do_start_slave_sql(mysql);
   if (!first_error)
     first_error= error;
   if (ignore_errors)
     return;
+  ignore_errors= 1; /* don't want to recurse, if something fails below */
+  if (opt_slave_data)
+    do_start_slave_sql(mysql);
   if (mysql)
     mysql_close(mysql);
   free_resources();
@@ -5799,8 +5800,8 @@ int main(int argc, char **argv)
   */
 err:
   /* if --dump-slave , start the slave sql thread */
-  if (opt_slave_data && do_start_slave_sql(mysql))
-    goto err;
+  if (opt_slave_data)
+    do_start_slave_sql(mysql);
 
 #ifdef HAVE_SMEM
   my_free(shared_memory_base_name);